]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Cleanup
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 26 Sep 2012 09:08:22 +0000 (09:08 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 26 Sep 2012 09:08:22 +0000 (09:08 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26749 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/setup_cached_variables.cmake
deal.II/cmake/setup_finalize.cmake

index bc62714c1188eccead867edc3a43291d59b6b4eb..9b771e38831c30aadab6aa8d7eb292a800d1a7bc 100644 (file)
@@ -88,10 +88,13 @@ ENDFOREACH()
 SET(deal_ii_used_flags
   CMAKE_C_FLAGS
   CMAKE_CXX_FLAGS
-  DEAL_II_C_FLAGS_RELEASE
-  DEAL_II_CXX_FLAGS_RELEASE
+  CMAKE_SHARED_LINKER_FLAGS
   DEAL_II_C_FLAGS_DEBUG
   DEAL_II_CXX_FLAGS_DEBUG
+  DEAL_II_SHARED_LINKER_FLAGS_DEBUG
+  DEAL_II_C_FLAGS_RELEASE
+  DEAL_II_CXX_FLAGS_RELEASE
+  DEAL_II_SHARED_LINKER_FLAGS_RELEASE
   )
 FOREACH(flag ${deal_ii_used_flags})
 
index 25b38952fd1d5c7f6a4146b9817f5b587915b45d..c0ccb9fc6a497e87dee7c41dc8a59a52456c5ac3 100644 (file)
@@ -20,7 +20,8 @@ FOREACH(flags ${deal_ii_used_flags})
   #
   # Strip leading and trailing whitespace:
   #
-  STRING(STRIP "${flags}" flags)
+  # STRING(STRIP "${flags}" flags)
+  STRING(STRIP "${${flags}}" ${flags})
 ENDFOREACH()
 
 
@@ -53,7 +54,7 @@ ENDIF()
 IF(CMAKE_BUILD_TYPE MATCHES "Debug")
   MESSAGE("      DEAL_II_CXX_FLAGS_DEBUG:             ${DEAL_II_CXX_FLAGS_DEBUG}")
 ENDIF()
-MESSAGE("      CMAKE_SHARED_LINKER_FLAGS:          ${CMAKE_SHARED_LINKER_FLAGS}")
+MESSAGE("      CMAKE_SHARED_LINKER_FLAGS:           ${CMAKE_SHARED_LINKER_FLAGS}")
 IF(CMAKE_BUILD_TYPE MATCHES "Release")
   MESSAGE("      DEAL_II_SHARED_LINKER_FLAGS_RELEASE:  ${DEAL_II_SHARED_LINKER_FLAGS_RELEASE}")
 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.