diff options
| author | Andrej Rode <mail@andrejro.de> | 2018-02-06 01:36:52 +0100 |
|---|---|---|
| committer | Andrej Rode <mail@andrejro.de> | 2018-02-07 20:00:42 +0100 |
| commit | 3b89a55fc4ac1af3538df47dd90c4063bb4522f7 (patch) | |
| tree | 197e14886f60a4d24763fbaddf20a5295b8c9816 | |
| parent | 81858b8677c3746d1bbf04e3e9bc3369cd5d6636 (diff) | |
cmake: C++11 is required for all, remove special case
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ca5f4f3fb..4e834f65da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,6 +158,7 @@ ENDIF() # if cmake version is < 3.1, explicitly set C standard to use. IF(${CMAKE_VERSION} VERSION_LESS "3.1") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c${CMAKE_C_STANDARD}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}") ENDIF() ######################################################################## @@ -378,19 +379,6 @@ GR_REGISTER_COMPONENT("testing-support" ENABLE_TESTING CPPUNIT_FOUND ) -# check if CppUnit version is 1.14.0 or greater; requires c++11 ... - -if(CPPUNIT_FOUND AND NOT "${CPPUNIT_VERSION}" VERSION_LESS "1.14.0") - message(WARNING "\nWarning: CppUnit version is ${CPPUNIT_VERSION} which requires C++11 for building. Trying to set CMake internally to use C++11 ...") - SET(CMAKE_CXX_STANDARD 11) -endif() - -# if cmake version is < 3.1, explicitly set C++ standard to use. - -if(${CMAKE_VERSION} VERSION_LESS "3.1") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}") -endif() - if(${CMAKE_BUILD_TYPE} STREQUAL "Coverage") include(CodeCoverage) setup_target_for_coverage(coverage "ctest || exit 0" coverage) |