From: maier Date: Wed, 26 Sep 2012 09:08:22 +0000 (+0000) Subject: Cleanup X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06852d403d2fad7fcbc08804bf8dc7966eb9c48a;p=dealii-svn.git Cleanup git-svn-id: https://svn.dealii.org/branches/branch_cmake@26749 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/setup_cached_variables.cmake b/deal.II/cmake/setup_cached_variables.cmake index bc62714c11..9b771e3883 100644 --- a/deal.II/cmake/setup_cached_variables.cmake +++ b/deal.II/cmake/setup_cached_variables.cmake @@ -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}) diff --git a/deal.II/cmake/setup_finalize.cmake b/deal.II/cmake/setup_finalize.cmake index 25b38952fd..c0ccb9fc6a 100644 --- a/deal.II/cmake/setup_finalize.cmake +++ b/deal.II/cmake/setup_finalize.cmake @@ -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()