Commit Graph

150 Commits

Author SHA1 Message Date
Stefan Weil
2e1cd1d448 Add dot product implementation for Intel FMA (double = tessdata_best)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:29:39 +01:00
Egor Pugin
cc1486d270 [cmake] Hide unnecessary find_package. 2019-11-01 12:26:15 +01:00
Egor Pugin
3afc185ad4 Implement CMake+SW build.
Currently only Windows is supported.
You could try it as following:

    mkdir build_sw && cd build_sw && cmake .. -DSW_BUILD=1
2019-11-01 12:26:09 +01:00
theirix
5688c26b03 Avoid using experimental C++14/17 support in CMake
This commit points CMAKE_CXX_STANDARD to the latest non-experimental standard.

CMake announces C++14 and C++17 support even if the
compiler supports it only experimentally (c++1y and c++1z).
It breaks cmake standard detection and requires workarounds
for old compilers.
2019-11-01 12:26:03 +01:00
zdenop
d93346ffef cmake: do not report unused-command-line-argument for clan released target 2019-11-01 12:25:36 +01:00
Stefan Weil
792b39d5c8 Revert "Move LSTMTrainer from libtesseract to libtesseract_training"
This reverts commit a30d433356.

That commit removed LSTMTrainer also from libtesseract.so which breaks
the ABI compatibility.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-06 07:41:22 +02:00
zdenop
10f5bffa48 decrease reuired version of cmake to build as 3.6 is still in use. Side effect no support for c++17 in CXX_STANDARD 2019-07-01 19:46:36 +02:00
Stefan Weil
1a205b8bed cmake: Fix build with OpenMP (issue #2462)
Builds with gcc wrongly used /openmp instead of -fopenmp.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-06-25 14:55:03 +02:00
Stefan Weil
a30d433356 Move LSTMTrainer from libtesseract to libtesseract_training
LSTMTrainer is only used for training, so the shared library for
Tesseract can be made smaller.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-06-23 08:53:21 +02:00
Stefan Weil
d7d0500030 Remove code for embedded build
That code is unrelated to Tesseract and can be easily implemented
by external projects which require it.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-06-18 09:46:16 +02:00
zdenop
9897bc9c8d cmake: backport master changes 2019-06-16 18:54:41 +02:00
zdenop
249acaed28 cmake: using c++ standard for g++ 2019-06-16 18:34:14 +02:00
Stefan Weil
2f6f77bb55 Revert "Do not hardcode c++11 for unix builds"
This reverts commit 4348793bd5.
It is needed for Travis CI based on Ubuntu Trusty.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-06-16 18:34:02 +02:00
İsmail Dönmez
796129ea58 Fix OpenMP builds on Unix 2019-06-16 18:33:42 +02:00
İsmail Dönmez
9fcef36bbb Do not hardcode c++11 for unix builds 2019-06-16 18:33:30 +02:00
İsmail Dönmez
911a991657 Detect and use C++17 support for CMake builds 2019-06-16 18:33:03 +02:00
Zdenko Podobný
39c800950f cmake: fix tiff linking to executable if tiffio.h is found 2019-06-16 18:26:08 +02:00
Zdenko Podobný
a14ae450b9 cmake: uninstall target 2019-05-16 20:16:22 +02:00
zdenop
ee024e0209 cmake: fix build without pkg-config (issue #2424) 2019-05-16 20:16:00 +02:00
Zdenko Podobný
52205ab495 cmake: fix linux build 2019-05-01 12:26:52 +02:00
zdenop
d5f23a61b3 cmake: fixes #2337 Android cross-build 2019-05-01 12:26:52 +02:00
zdenop
cd2ff22784 cmake: remove host.h from installation, remove definition of NOMINMAX and report used C++ standard 2019-05-01 12:26:52 +02:00
zdenop
7fc245c38a cmake: show configuration summary 2019-05-01 11:27:11 +02:00
zdenop
b9f7bb2b89 cmake: add detection of AVX, AVX2, SSE41 2019-05-01 11:26:43 +02:00
zdenop
29ab1a42cc fix finding tiffio.h cmake&clang on windows 2019-05-01 11:26:26 +02:00
zdenop
95a15a7a82 fix cmake&clang build 2019-04-06 15:31:53 +02:00
Stefan Weil
e76d81a0d5 Include src/training when exporting compile commands with cmake
`cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..` is used to get the file
compile_commands.json which is required by clang-tidy.

Export compile commands for all source files, not only those from
the default build, so clang-tidy can cover all source files.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-04-02 06:34:45 +02:00
Stefan Weil
ab009fae94 Remove macro WINDLLNAME
It is now no longer used.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-03-31 20:05:41 +02:00
zdenop
8891ba9711 add autotools options to cmake build 2019-03-17 14:50:36 +01:00
Egor Pugin
c4dd537206 [cmake] Add visibility to all target_link_libraries calls. 2019-03-11 00:11:25 +03:00
Egor Pugin
b0f61dfd1c Propagate libarchive to tess users. 2019-03-11 00:06:50 +03:00
Egor Pugin
37b0c36e32 Add libarchive dependency to cppan and sw builds. 2019-03-11 00:03:45 +03:00
zdenop
4ed44d70c5 cmake: enable libArchive support for non_cppan build 2019-03-10 20:08:19 +01:00
zdenop
441779de51 fix showing git tag for cmake build 2019-02-17 20:52:40 +01:00
zdenop
a2481de926 Revert "cmake workaround for #2246 for clang"
This reverts commit 4d8bbe2c97.
2019-02-17 16:34:39 +01:00
zdenop
e54c06f8d4 Merge branch 'master' of https://github.com/tesseract-ocr/tesseract 2019-02-16 17:56:18 +01:00
zdenop
4d8bbe2c97 cmake workaround for #2246 for clang 2019-02-16 17:55:45 +01:00
zdenop
15f2a4b2c1
Merge pull request #2231 from Shreeshrii/wordstr
Add renderer to create WordStr box files from images
2019-02-16 13:48:06 +01:00
Stefan Weil
7a1c6fe6f3 Fix typo
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-02-16 09:34:17 +01:00
zdenop
7f65afbaeb cmake check for avaible C++ standard. Mininum reqiered standard is C++11 2019-02-15 17:50:45 +01:00
Shree Devi Kumar
f3362a4b5b Add renderer to create WordStr box files from images 2019-02-10 19:59:17 +00:00
Shree Devi Kumar
9c89cd51cf Add a new renderer to create box files from images for LSTM training
(cherry picked from commit 921da6be2bdbda2ddd64514f9b6bec40a336246a)

fix typo

(cherry picked from commit 7bd1a0c80393fce2f34e2845cb26760bcf3791cd)

Add lstmboxrenderer to CMakeLists

(cherry picked from commit cfef3a889aef830725921b5c0218d5e9c633b03e)

fix formatting

(cherry picked from commit 7ba2b01ede7940ed609a073364948ef8c838cd10)
2019-02-05 14:03:29 +00:00
Zdenko Podobný
31c48a04d4 fix travis 2019-02-01 20:01:33 +01:00
Zdenko Podobný
0e090cd230 fix typo 2019-02-01 18:28:47 +01:00
Zdenko Podobný
114bc5016e improve cmake configuration 2019-02-01 18:02:28 +01:00
zdenop
fc55b5872d use AVX2 SSE for cmake&clang on Windows 2019-01-29 20:04:44 +01:00
zdenop
fd881e4486 fix cmake PACKAGE_VERSION to behave same way as in autotools 2019-01-29 20:01:55 +01:00
Stefan Weil
394839cdd7 Fix cmake compiler flags for AVX/SSE support
Commit 5f96ac1a71 had a typo
in the filename (simdetect.cpp / simddetect.cpp) which caused
a regression: AVX / AVX2 / SSE was no longer used.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-01-29 17:27:36 +01:00
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