mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2025-01-21 00:20:45 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #3036 from xuzhen/master

Browse Source 
Fixed CMakeLists.txt for the compilers without C++17 support
This commit is contained in:
zdenop 2020-06-26 14:40:38 +02:00 committed by GitHub
commit d17ec2c754
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -118,6 +118,13 @@ else() # minimum required standard
set(CMAKE_CXX_STANDARD 11)
endif()
if ("${CMAKE_CXX17_STANDARD_COMPILE_OPTION}" STREQUAL "")
set(CMAKE_CXX_STANDARD 14)
endif()
if ("${CMAKE_CXX14_STANDARD_COMPILE_OPTION}" STREQUAL "")
set(CMAKE_CXX_STANDARD 11)
endif()
# Avoid using experimental c++1y (c++1z) standard even if the compiler announces cxx14 (cxx17)
# in CMAKE_CXX_KNOWN_FEATURES and CMAKE_CXX_COMPILE_FEATURES
# It is the case of clang 3.9, 4.0 (announces c++1z) and gcc 4.8 (announces c++1y)