]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Cleanup
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 07:56:51 +0000 (07:56 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 07:56:51 +0000 (07:56 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26821 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/checks/check_for_cxx_features.cmake
deal.II/cmake/configure/configure_trilinos.cmake

index 5d445969e8b59ed38af026fb86f5c61813d701e4..71c0689fb16d7de85dbc7d583ead9d337f4ce459 100644 (file)
@@ -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()
 
 
index 9e12bb1a3ddd198fea0b07e5f22378ef38c331a5..05cc7654754d00fcaddc4b4dd3e1ba05d94c7b7c 100644 (file)
@@ -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 <Sacado_cmath.hpp>
@@ -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})
 
     #

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.