@@ -53,6 +53,18 @@ set(GENERIC_MICRO_VERSION ${VERSION_PATCH})
53
53
54
54
set (MINIMUM_LEPTONICA_VERSION 1.74)
55
55
56
+ ###############################################################################
57
+ #
58
+ # options
59
+ #
60
+ ###############################################################################
61
+
62
+ option (CPPAN_BUILD "Build with cppan" ON )
63
+ option (OPENMP_BUILD "Build with openmp support" OFF ) # see issue #1662
64
+ option (BUILD_TRAINING_TOOLS "Build training tools" ON )
65
+ option (BUILD_TESTS "Build tests" OFF )
66
+
67
+
56
68
###############################################################################
57
69
#
58
70
# compiler and linker
@@ -71,17 +83,23 @@ endif()
71
83
if (WIN32 )
72
84
if (MSVC )
73
85
add_definitions (-D_CRT_SECURE_NO_WARNINGS)
74
- if (CLANG)
75
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fopenmp /utf-8" )
76
- else ()
86
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8" )
87
+ if (NOT CLANG)
77
88
add_definitions (-DNOMINMAX)
78
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /openmp /utf-8 " )
89
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP" )
79
90
endif ()
80
91
endif ()
81
-
82
92
set (LIB_Ws2_32 Ws2_32)
83
93
endif ()
84
94
95
+ if (OPENMP_BUILD)
96
+ if (CLANG)
97
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fopenmp" )
98
+ else (MSVC )
99
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp" )
100
+ endif ()
101
+ endif ()
102
+
85
103
if (CYGWIN )
86
104
add_definitions (-D__CYGWIN__)
87
105
endif ()
@@ -100,8 +118,6 @@ endif()
100
118
#
101
119
###############################################################################
102
120
103
- option (CPPAN_BUILD "Build with cppan" ON )
104
-
105
121
if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR} /.cppan OR NOT CPPAN_BUILD)
106
122
if (NOT Leptonica_DIR AND NOT MSVC )
107
123
find_package (PkgConfig REQUIRED)
@@ -121,9 +137,6 @@ endif()
121
137
122
138
find_package (OpenCL QUIET )
123
139
124
- option (BUILD_TRAINING_TOOLS "Build training tools" ON )
125
- option (BUILD_TESTS "Build tests" OFF )
126
-
127
140
###############################################################################
128
141
#
129
142
# configure
@@ -302,7 +315,7 @@ else()
302
315
export (TARGETS libtesseract APPEND FILE ${CMAKE_CURRENT_BINARY_DIR} /TesseractTargets.cmake)
303
316
endif ()
304
317
305
- if (WIN32 AND CLANG)
318
+ if (WIN32 AND CLANG AND OPENMP_BUILD )
306
319
# Workaround for "libomp.lib is not automatically added on Windows"
307
320
# see: http://lists.llvm.org/pipermail/openmp-dev/2015-August/000857.html
308
321
# TODO: Find better way how to set Clang OpenMP library for linking on Windows
0 commit comments