zdenop
b30e92fb8a
turn off openmp build for cmake (issue #263 )
2019-01-24 23:03:47 +01:00
Egor Pugin
a1ec977f1e
Revert "Fix broken builds"
...
This reverts commit 0c5f81947e
.
2019-01-16 13:15:56 +03:00
Stefan Weil
0c5f81947e
Fix broken builds
...
Don't use CPPAN by default because it fails with an error message:
/usr/bin/ld: cannot find -lpvt.cppan.demo.danbloomberg.leptonica
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-01-16 09:25:28 +01:00
Stefan Weil
605b4d66c7
Replace dynamically allocated IntSimdMatrix instances by constants
...
Two header files are no longer needed and could be removed.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-01-14 21:34:37 +01:00
zdenop
c39a95ca57
try to fix appveyor
2019-01-06 17:46:59 +01:00
zdenop
bd1c05c102
remove old line
2019-01-06 16:56:38 +01:00
zdenop
c41a80f107
respect cmake -DCPPAN_BUILD=OFF
2019-01-06 16:47:54 +01:00
René Hansen
ff2535f8ec
Avoid linking pthread on Android
2019-01-03 23:53:38 +01:00
Stefan Weil
5f96ac1a71
Update cmake compiler flags for new simdetect.cpp
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-01-01 13:15:58 +01:00
zdenop
d3065520fa
fix 2 clang warnings
2018-12-30 20:25:24 +01:00
zdenop
b9a34d741d
add support for clang on windows (cmake&ninja)
2018-12-29 10:43:13 +01:00
zdenop
3e6ec97ac3
Remove altorenderer.cpp from resource compiling (already included in tesseract_src)
2018-12-29 10:30:56 +01:00
Stefan Weil
fda0fa4e7e
Add new hocrrenderer.cpp to CMakeList.txt and Android.mk
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-12-15 22:58:51 +01:00
Jake Sebright
d7cee03a94
Add support for ALTO output
2018-11-30 06:09:36 +01:00
zdenop
28df28123e
Merge branch 'master' of https://github.com/tesseract-ocr/tesseract
2018-11-08 19:44:22 +01:00
Zdenko Podobný
2dd753ee4c
replace VS implementation of gettimeofday with std::chrono::steady_clock::now(); fixes #2038
2018-11-08 19:43:46 +01:00
Stefan Weil
f4ec5beedc
Remove dummy test
...
This reverts commit 99755b0732
.
The dummy test is no longer needed as there exist a lot of real tests now.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-11-08 18:53:15 +01:00
Joel Gallant
422d1ca25a
Uses CMAKE_CURRENT_ variables instead of PROJECT_
2018-10-30 12:58:50 -06:00
Joel Gallant
58328405ec
Adjusts CMAKE_MODULE_PATH instead of the include()'s
2018-10-30 12:51:09 -06:00
Joel Gallant
a4cb790e1d
Reverts change on EXECUTABLE_OUTPUT_PATH
2018-10-30 12:27:34 -06:00
Joel Gallant
e87dc5b1f2
Uses PROJECT_ variables instead of CMAKE_ variables so it can be included using add_subdirectory
2018-10-30 12:00:32 -06:00
zdenop
6cee0528f5
turn off cmake test building
2018-10-13 20:48:10 +02:00
Stefan Weil
91522dfba5
Remove memry.h from public API
...
It is no longer needed by genericvector.h.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-23 21:15:54 +02:00
Stefan Weil
a9e2574eff
Remove public API file ndminx.h
...
It is not needed for the Tesseract code, and the Tesseract API
should not provide MIN / MAX macros.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-21 08:33:30 +02:00
Alexander Zaitsev
d54d7486b4
Use std::max/std::min instead of MAX/MIN macros.
2018-05-20 17:49:48 +03:00
Stefan Weil
f54800f14b
Add /utf-8 for MSVC
...
This fixes 208 compiler warnings of this form:
C4566: character represented by universal-character-name [...]
cannot be represented in the current code page (1252)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-05-03 14:01:28 +02:00
Egor Pugin
104fe7931c
Move training to src.
2018-04-25 11:35:26 +03:00
Egor Pugin
ca5c15e6a8
Set correct rc name.
2018-04-25 11:27:40 +03:00
Egor Pugin
cfe15b9d14
Remove wrong src dir from configure.
2018-04-25 11:09:45 +03:00
Egor Pugin
8ae22b9ebb
Remove wrong src dir from configure.
2018-04-25 11:09:04 +03:00
Egor Pugin
e95ff1159e
Move sources into src dir. Update build scripts.
2018-04-25 11:02:54 +03:00
bloke
2bdee5c5e4
cmake switch to turn off test building
2018-04-14 10:32:50 +02:00
bloke
da65617d74
cmake switch to turn off test building
2018-04-14 10:26:29 +02:00
Egor Pugin
742a087507
Merge branch 'master' of github.com-egorpugin:tesseract-ocr/tesseract
2018-04-11 00:16:35 +03:00
Egor Pugin
7dd2ecd026
Move cmake packages detection after compiler settings.
2018-04-11 00:16:31 +03:00
Zdenko Podobny
10f4998aee
fix cmake build of training tools
2018-04-02 22:30:55 +02:00
Zdenko Podobný
e9e1e93686
add tess_version.h to distribution
2018-04-02 21:48:29 +02:00
Zdenko Podobný
af037c27e7
rename version.h.in because the filename is too general for distribution
2018-04-02 19:11:02 +02:00
Zdenko Podobny
f8e26eedff
fix cmake windows version info for tesseract library and executable
2018-03-31 12:49:29 +02:00
Stefan Weil
8701b15134
cmake: Automatically build tesseract.rc with version from file
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-03-28 14:26:03 +02:00
Stefan Weil
832926f5af
Update library version handling for cmake ( #1435 )
...
As Tesseract now uses semantic versioning, the old method to calculate
the library version was no longer valid.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-03-28 10:00:18 +02:00
Stefan Weil
b1d291e6fd
cmake: Get version information from VERSION file ( #1436 )
...
Create also api/version.h like it is done for autoconf.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-03-28 09:58:25 +02:00
Egor Pugin
3fa25d9bbc
Install training tools with CMake.
2018-03-23 23:28:51 +03:00
Stefan Weil
b94bbd6e83
Update version handling ( #1408 )
...
ccutil/version.h is now no longer needed.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-03-22 21:49:47 +01:00
Stefan Weil
8209ce3663
cmake: Update version and add it to config_auto.h ( #1402 )
...
In a next step, the package version should be read from the VERSION file.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-03-18 21:10:07 +01:00
Stefan Weil
7972b13e3a
Remove macro USE_STD_NAMESPACE ( #1360 )
...
The related code in training/util.h now uses the GOOGLE_TESSERACT macro
to enable Google specific code to disable heap checking.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-03-04 14:43:28 +01:00
Amit D
d377281f73
Update CMakeLists.txt
2018-01-24 19:21:37 +02:00
Amit D
82ba423537
Update CMakeLists.txt
2018-01-24 19:07:17 +02:00
Egor Pugin
2da95d63bc
Add more avx2, sse4.1 flags. Add MSVC's AVX2 ICE workaround.
2018-01-24 18:45:15 +03:00
Egor Pugin
4b6fefb2ac
Add openmp support for Visual Studio builds.
2018-01-23 21:57:52 +03:00
Scott Talbot
a538cd126b
Add Leptonica's pkg-config-found library directory to the search path
2017-10-03 21:15:44 +11:00
Clayton Walker
0d7c89ead4
Add -mavx and -msse4.1 compile flags on unix
2017-09-06 18:55:27 -06:00
Clayton Walker
69b9d298c7
Fix version.h not being installed
2017-08-29 15:14:54 -06:00
Clayton Walker
52cac3a42e
Fix library being named liblibtesseract on non win32 platforms
2017-08-29 15:14:13 -06:00
Stefan Weil
99755b0732
googletest: Add dummy test
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-07-24 19:45:06 +02:00
Stefan Weil
796cd7ab56
cmake: Add googletest
...
The submodule is build automatically as soon as it exists.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-07-24 19:45:06 +02:00
Egor Pugin
7dcd2ff90a
Update CMakeLists.txt
2017-05-06 14:46:46 +03:00
Aleksey Nikolaev
be747a501b
Correct include path for installed project
2017-04-20 14:59:13 +03:00
Aleksey Nikolaev
6641989866
Cmake install
2017-04-20 14:50:53 +03:00
Egor Pugin
5a37a8b593
Update CMakeLists.txt
2017-03-14 17:26:53 +03:00
Egor Pugin
b6eb8bebb1
Update CMakeLists.txt
2017-03-10 00:24:05 +03:00
Egor Pugin
e376ffc5fe
Fix avx on windows.
2017-02-23 19:29:48 +03:00
Egor Pugin
5118384542
Fix sse4.1 on windows.
2017-02-23 15:50:09 +03:00
Egor Pugin
0dcb6b3547
Rename cppan/cmake projects.
2017-02-23 15:39:58 +03:00
Egor Pugin
2f10be5f6b
Update CMakeLists.txt
2017-02-07 17:50:30 +03:00
Egor Pugin
f4ea71ea22
Update CMakeLists.txt
2016-12-26 17:51:03 +03:00
Egor Pugin
1127d0145e
Update CMakeLists.txt
2016-12-26 17:35:50 +03:00
Egor Pugin
3566a1d467
Merge pull request #613 from stweil/lept
...
Fix Leptonica version check for cmake
2016-12-26 17:33:53 +03:00
Egor Pugin
c160f80133
Add error message with cmake 3.6.
2016-12-26 17:30:41 +03:00
Stefan Weil
7a9a2f7b33
Fix Leptonica version check for cmake
...
* The check was missing.
* The check did not work with the given Leptonica version.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-26 15:28:31 +01:00
Amit D
43322643ff
CMake - Set minimum Leptonica version to 1.74.0
2016-12-25 09:36:09 +02:00
Egor Pugin
f0bbf1aeeb
Update cppan config.
2016-12-22 22:30:16 +03:00
Egor Pugin
2d1decbdcf
Disable training tools on appveyor because of installed cmake 3.6 bug.
2016-12-17 18:33:41 +03:00
Egor Pugin
442b5b731a
Fix building of training tools in shared configuration.
2016-12-17 16:19:35 +03:00
Egor Pugin
dd91c1e479
Turn on silent building for CIs with cppan.
2016-12-15 16:04:18 +03:00
Egor Pugin
ead87a7180
Fix build.
2016-12-15 12:43:13 +03:00
Stefan Weil
95df572083
Fix broken cmake builds
...
Cmake builds need the additional directories `arch` and `lstm`
to find all include files and also for linking.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-11-23 16:37:26 +01:00
Egor Pugin
193032a778
Update CMakeLists.txt
2016-09-05 18:10:56 +03:00
Egor Pugin
553c069608
Remove unused defines.
2016-07-03 23:34:14 +03:00
Egor Pugin
57605d99e9
Implement CPPAN support for easy Windows building.
2016-06-30 00:29:55 +03:00
Egor Pugin
7b94871ba2
Add more include directories.
2016-02-04 13:44:07 +03:00
Egor Pugin
b48abd8e17
Improve leptonica search.
2016-01-26 14:52:18 +03:00
Egor Pugin
0970227ca7
Update CMakeLists.txt
2016-01-26 14:28:41 +03:00
Egor Pugin
354526e85e
Merge branch 'master' of github.com-egorpugin:egorpugin/tesseract
2016-01-26 14:21:29 +03:00
Egor Pugin
94be926be0
Update leptonica version.
2016-01-26 14:14:48 +03:00
Egor Pugin
b9a6aa823b
Update CMakeLists.txt
2016-01-26 14:04:29 +03:00
Egor Pugin
2cf2cfcf99
Update CMakeLists.txt
2016-01-26 13:39:59 +03:00
Egor Pugin
5dee50aa03
Show all warnings.
2015-11-30 11:52:21 +03:00
Egor Pugin
f15cd961c6
Download icu on windows to build set_unicharset_properties target.
2015-11-30 11:43:01 +03:00
Egor Pugin
0788098b80
Fix Linux build with Leptonica_BUILD_DIR.
2015-10-09 18:22:04 +03:00
Egor Pugin
dfb5aa5c34
Add Leptonica_BUILD_DIR option for CMake find_package in Config mode. Set correct .so name on Linux.
2015-10-09 18:12:02 +03:00
Egor Pugin
a614edbe94
Merge branch 'master' of github.com:egorpugin/tesseract
2015-10-05 22:33:24 +03:00
Egor Pugin
93d1c66e4e
Add FindLeptonica.cmake module to find installed liblept on *nix systems.
2015-10-05 22:33:10 +03:00
Egor Pugin
670e0fafb3
Hide pango and cairo includes from targets that do not use it.
2015-09-07 12:49:08 +03:00
Egor Pugin
da3852dc77
Fix cygwin build.
2015-09-07 02:49:18 +03:00
Egor Pugin
c0d8a07b9d
Fix a lot of training tool to work on windows with static build.
2015-09-07 01:46:33 +03:00
Egor Pugin
b375728012
Add BUILD_TRAINING CMake option.
2015-09-06 23:59:54 +03:00
egorpugin
8d8636a1fc
Update CMakeLists.txt
2015-09-06 21:42:47 +03:00
egorpugin
f9f85b88d0
Update CMakeLists.txt
2015-09-06 21:05:05 +03:00
Egor Pugin
03531ba8a5
Fix linux build.
2015-09-06 20:43:28 +03:00
Egor Pugin
5e3b8d33e3
Add source groups.
2015-09-06 13:47:30 +03:00
Egor Pugin
56a5195293
Initial CMake implementation.
2015-09-06 00:47:32 +03:00