diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-02-20 09:31:27 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-02-20 09:31:27 +0100 |
| commit | 3594451ee02f006d987e416e711103b2bc860454 (patch) | |
| tree | a5f028a2ad920e7caf187dc6839c7f8084ba87f7 /cmake | |
| parent | b192e29eae844ed21d309a0d3c496370811a0c3e (diff) | |
Remove EIGEN_TEST_C++0x option and let EIGEN_TEST_CXX11 adds the -std=c++11 flag
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/EigenConfigureTesting.cmake | 11 | ||||
| -rw-r--r-- | cmake/EigenTesting.cmake | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/cmake/EigenConfigureTesting.cmake b/cmake/EigenConfigureTesting.cmake index 737f77232..0ee484e8c 100644 --- a/cmake/EigenConfigureTesting.cmake +++ b/cmake/EigenConfigureTesting.cmake @@ -49,9 +49,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) else(EIGEN_COVERAGE_TESTING) set(COVERAGE_FLAGS "") endif(EIGEN_COVERAGE_TESTING) - if(EIGEN_TEST_C++0x) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x") - endif(EIGEN_TEST_C++0x) + if(CMAKE_SYSTEM_NAME MATCHES Linux) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_FLAGS} -g2") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COVERAGE_FLAGS} -O2 -g2") @@ -61,3 +59,10 @@ if(CMAKE_COMPILER_IS_GNUCXX) elseif(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS") endif(CMAKE_COMPILER_IS_GNUCXX) + + +check_cxx_compiler_flag("-std=c++11" EIGEN_COMPILER_SUPPORT_CXX11) + +if(EIGEN_TEST_CXX11 AND EIGEN_COMPILER_SUPPORT_CXX11) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +endif() diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake index dc69f65aa..b4ab95dbc 100644 --- a/cmake/EigenTesting.cmake +++ b/cmake/EigenTesting.cmake @@ -299,6 +299,12 @@ macro(ei_testing_print_summary) else() message(STATUS "ARMv8 NEON: Using architecture defaults") endif() + + if(EIGEN_TEST_CXX11) + message(STATUS "C++11: ON") + else() + message(STATUS "C++11: OFF") + endif() endif() # vectorization / alignment options |