]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Cosmetic changes
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 24 Nov 2012 01:16:48 +0000 (01:16 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 24 Nov 2012 01:16:48 +0000 (01:16 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27677 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_1_threads.cmake
deal.II/cmake/macros/macro_enable_if_links.cmake
deal.II/cmake/setup_compiler_flags_gnu.cmake

index 9b66de53d4faf0ac3c9233b9fa448f08a08e96bc..325b6d395fe0b53fb2c932f1c9828f71ff4371d3 100644 (file)
@@ -43,9 +43,9 @@ MACRO(SETUP_THREADING var)
     #
     IF("${CMAKE_THREAD_LIBS_INIT}" MATCHES "-lpthread")
       CHECK_CXX_COMPILER_FLAG("-pthread"
-        DEAL_II_HAVE_FLAG_-pthread
+        DEAL_II_HAVE_FLAG_pthread
         )
-      IF(DEAL_II_HAVE_FLAG_-pthread)
+      IF(DEAL_II_HAVE_FLAG_pthread)
         STRING(REPLACE "-lpthread" "-pthread" CMAKE_THREAD_LIBS_INIT
           "${CMAKE_THREAD_LIBS_INIT}"
           )
index 462dc7a400c600c2305f0f1760b660e8c73926bd..5a8525afe3839d0ac49de4a14f99b013f357938a 100644 (file)
 #
 
 MACRO(ENABLE_IF_LINKS _variable _flag)
+  STRING(REGEX REPLACE "^-" "" _flag_name "${_flag}")
+
   ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${_flag}")
   CHECK_CXX_SOURCE_COMPILES(
   "
   int main() { return 0; }
   "
-  DEAL_II_HAVE_FLAG_${_flag}
+  DEAL_II_HAVE_FLAG_${_flag_name}
   )
   STRIP_FLAG(CMAKE_REQUIRED_FLAGS "${_flag}")
-  IF(DEAL_II_HAVE_FLAG_${_flag})
+  IF(DEAL_II_HAVE_FLAG_${_flag_name})
     SET(${_variable} "${${_variable}} ${_flag}")
   ENDIF()
 ENDMACRO()
index 4799abadde2bc0260ae22f64b7ecde04fe902f8a..70fa3595dd0889af7656fb78da4963c77b97026b 100644 (file)
@@ -137,7 +137,7 @@ IF (CMAKE_BUILD_TYPE MATCHES "Debug")
   #
   # If -ggdb is not available, fall back to -g:
   #
-  IF(NOT DEAL_II_HAVE_FLAG_-ggdb)
+  IF(NOT DEAL_II_HAVE_FLAG_ggdb)
     ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_DEBUG "-g")
     ENABLE_IF_SUPPORTED(DEAL_II_SHARED_LINKER_FLAGS_DEBUG "-g")
   ENDIF()

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.