]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
CMake: Bugfixes, be more robust in two macros
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 11 Mar 2013 18:16:02 +0000 (18:16 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 11 Mar 2013 18:16:02 +0000 (18:16 +0000)
git-svn-id: https://svn.dealii.org/trunk@28856 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/macros/macro_add_flags.cmake
deal.II/cmake/macros/macro_enable_if_supported.cmake

index b3d15f1b14cd374be5177d841ab30cd067e47a95..2bcddaa0a83655a1573a4837f521e16653c2f071 100644 (file)
@@ -21,6 +21,8 @@
 #
 
 MACRO(ADD_FLAGS _variable _flags)
-  SET(${_variable} "${${_variable}} ${_flags}")
+  IF(NOT "${_flags}" STREQUAL "")
+    SET(${_variable} "${${_variable}} ${_flags}")
+  ENDIF()
 ENDMACRO()
 
index 817018746cca2a41f3ace5f2990195a24fd666ad..d843de50dabd2a9a85057e9bf4d0ba8bb711b6a9 100644 (file)
 #
 
 MACRO(ENABLE_IF_SUPPORTED _variable _flag)
-  STRING(REGEX REPLACE "^-" "" _flag_name "${_flag}")
-  CHECK_CXX_COMPILER_FLAG(
-    "${_flag}"
-    DEAL_II_HAVE_FLAG_${_flag_name}
-    )
-  IF(DEAL_II_HAVE_FLAG_${_flag_name})
-    SET(${_variable} "${${_variable}} ${_flag}")
+  IF(NOT "${_flag}" STREQUAL "")
+    STRING(REGEX REPLACE "^-" "" _flag_name "${_flag}")
+    CHECK_CXX_COMPILER_FLAG(
+      "${_flag}"
+      DEAL_II_HAVE_FLAG_${_flag_name}
+      )
+    IF(DEAL_II_HAVE_FLAG_${_flag_name})
+      SET(${_variable} "${${_variable}} ${_flag}")
+    ENDIF()
   ENDIF()
 ENDMACRO()
 

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.