mirror of
https://github.com/tesseract-ocr/tesseract.git
synced 2025-06-09 19:32:40 +08:00
cmake: using c++ standard for g++
This commit is contained in:
parent
b9a31eca37
commit
5e62d02230
@ -8,7 +8,7 @@
|
|||||||
#
|
#
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
|
cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
|
||||||
|
|
||||||
# In-source builds are disabled.
|
# In-source builds are disabled.
|
||||||
if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
|
if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
|
||||||
@ -95,6 +95,15 @@ elseif(cxx_std_14 IN_LIST known_features)
|
|||||||
else() # minimum required standard
|
else() # minimum required standard
|
||||||
set(CMAKE_CXX_STANDARD 11)
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# workaround for bad info in CMAKE_CXX_KNOWN_FEATURES for g++ 4.8.4
|
||||||
|
if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
|
||||||
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
|
if (${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL "6.1.0")
|
||||||
|
set(CMAKE_CXX_STANDARD 14)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
|
|
||||||
@ -131,9 +140,6 @@ if (CYGWIN)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
# Hack for old cmake / compiler in Ubuntu Trusty.
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
|
|
||||||
|
|
||||||
if (NOT ANDROID)
|
if (NOT ANDROID)
|
||||||
set(LIB_pthread pthread)
|
set(LIB_pthread pthread)
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user