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