From: maier Date: Fri, 28 Sep 2012 07:56:51 +0000 (+0000) Subject: Cleanup X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5538498d1e9b6b2d19259452a6acb54858c30e32;p=dealii-svn.git Cleanup git-svn-id: https://svn.dealii.org/branches/branch_cmake@26821 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/checks/check_for_cxx_features.cmake b/deal.II/cmake/checks/check_for_cxx_features.cmake index 5d445969e8..71c0689fb1 100644 --- a/deal.II/cmake/checks/check_for_cxx_features.cmake +++ b/deal.II/cmake/checks/check_for_cxx_features.cmake @@ -22,7 +22,7 @@ FOREACH(test_flag "-std=c++11" "-std=c++-x" ) - SET(flag ${test_flag}) + SET(DEAL_II_CXX11_FLAG ${test_flag}) CHECK_CXX_COMPILER_FLAG("${test_flag}" DEAL_II_HAVE_CXX11_FLAG) IF(DEAL_II_HAVE_CXX11_FLAG) BREAK() @@ -32,7 +32,7 @@ ENDFOREACH() IF(DEAL_II_HAVE_CXX11_FLAG) # Set CMAKE_REQUIRED_FLAGS for the unit tests - ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${flag}") + ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${DEAL_II_CXX11_FLAG}") CHECK_CXX_SOURCE_COMPILES( " @@ -141,16 +141,16 @@ IF(DEAL_II_HAVE_CXX11_FLAG) DEAL_II_HAVE_CXX11_TUPLE AND DEAL_II_HAVE_CXX11_TYPE_TRAITS ) - MESSAGE(STATUS "Sufficient C++11 support. Enabling ${flag}.") + MESSAGE(STATUS "Sufficient C++11 support. Enabling ${DEAL_II_CXX11_FLAG}.") SET(DEAL_II_CAN_USE_CXX1X TRUE) # TODO SET(DEAL_II_CAN_USE_CXX11 TRUE) - ADD_FLAGS(CMAKE_CXX_FLAGS "${flag}") + ADD_FLAGS(CMAKE_CXX_FLAGS "${DEAL_II_CXX11_FLAG}") ELSE() - MESSAGE(STATUS "Insufficient C++11 support. Disabling ${flag}.") + MESSAGE(STATUS "Insufficient C++11 support. Disabling ${DEAL_II_CXX11_FLAG}.") ENDIF() IF(DEAL_II_CAN_USE_CXX11) @@ -186,10 +186,10 @@ IF(DEAL_II_HAVE_CXX11_FLAG) ENDIF() ENDIF() - STRIP_FLAG(CMAKE_REQUIRED_FLAGS "${flag}") + STRIP_FLAG(CMAKE_REQUIRED_FLAGS "${DEAL_II_CXX11_FLAG}") ELSE() - MESSAGE(STATUS "Insufficient C++11 support. Disabling ${flag}.") + MESSAGE(STATUS "Insufficient C++11 support. Disabling ${DEAL_II_CXX11_FLAG}.") ENDIF() diff --git a/deal.II/cmake/configure/configure_trilinos.cmake b/deal.II/cmake/configure/configure_trilinos.cmake index 9e12bb1a3d..05cc765475 100644 --- a/deal.II/cmake/configure/configure_trilinos.cmake +++ b/deal.II/cmake/configure/configure_trilinos.cmake @@ -103,7 +103,7 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) # Test whether that is indeed the case # LIST(APPEND CMAKE_REQUIRED_INCLUDES ${TRILINOS_INCLUDE_DIRS}) - ADD_FLAGS(CMAKE_REQUIRED_FLAGS "-std=c++0x") + ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${DEAL_II_CXX11_FLAG}") CHECK_CXX_SOURCE_COMPILES( " #include @@ -135,7 +135,7 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) SET(${var} FALSE) ENDIF() ENDIF() - STRIP_FLAG(CMAKE_REQUIRED_FLAGS "-std=c++0x") + STRIP_FLAG(CMAKE_REQUIRED_FLAGS "${DEAL_II_CXX11_FLAG") LIST(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES ${TRILINOS_INCLUDE_DIRS}) #