Skip to content

Commit 63448de

Browse files
committed
cmake: remove host.h from installation, remove definition of NOMINMAX and report used C++ standard
1 parent 129fe95 commit 63448de

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

CMakeLists.txt

+1-4
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,8 @@ endif()
9090
get_property(known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
9191
if(cxx_std_14 IN_LIST known_features)
9292
set(CMAKE_CXX_STANDARD 14)
93-
message("C++14 support enabled...")
9493
else() # minimum required standard
9594
set(CMAKE_CXX_STANDARD 11)
96-
message("C++11 support enabled...")
9795
endif()
9896
set(CMAKE_CXX_STANDARD_REQUIRED ON)
9997
set(CMAKE_CXX_EXTENSIONS OFF)
@@ -111,7 +109,6 @@ if (WIN32)
111109
if (MSVC)
112110
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
113111
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
114-
add_definitions(-DNOMINMAX)
115112
if (NOT CLANG)
116113
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
117114
endif()
@@ -243,6 +240,7 @@ message( STATUS "General configuration for Tesseract ${PACKAGE_VERSION}")
243240
message( STATUS "--------------------------------------------------------")
244241
message( STATUS "Build type: ${CMAKE_BUILD_TYPE}")
245242
message( STATUS "Compiler: ${CMAKE_CXX_COMPILER_ID}")
243+
message( STATUS "Used standard: C++${CMAKE_CXX_STANDARD}")
246244
message( STATUS "CXX compiler options: ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UP}} ${CMAKE_CXX_FLAGS}")
247245
message( STATUS "Linker options: ${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UP}}")
248246
message( STATUS "Install directory: ${CMAKE_INSTALL_PREFIX}")
@@ -472,7 +470,6 @@ install(FILES
472470
src/ccutil/fileerr.h
473471
src/ccutil/genericvector.h
474472
src/ccutil/helpers.h
475-
src/ccutil/host.h
476473
src/ccutil/params.h
477474
src/ccutil/ocrclass.h
478475
src/ccutil/platform.h

0 commit comments

Comments
 (0)