From f7fffa694b77aba6395bb85e67feb9c0dcc23db3 Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 26 Sep 2012 18:12:27 +0000 Subject: [PATCH] Bugfixes git-svn-id: https://svn.dealii.org/branches/branch_cmake@26757 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/README.CMAKE | 2 +- ...cro_deal_ii_initialize_cached_variables.cmake | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/deal.II/README.CMAKE b/deal.II/README.CMAKE index 80f75f3f24..81ba7bf34e 100644 --- a/deal.II/README.CMAKE +++ b/deal.II/README.CMAKE @@ -7,7 +7,7 @@ ================================================== - Author: Matthias Maier, University Heidelberg 2012 + Author: Matthias Maier , 2012 diff --git a/deal.II/cmake/macros/macro_deal_ii_initialize_cached_variables.cmake b/deal.II/cmake/macros/macro_deal_ii_initialize_cached_variables.cmake index 2a5d2c3a8f..c90523e043 100644 --- a/deal.II/cmake/macros/macro_deal_ii_initialize_cached_variables.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_initialize_cached_variables.cmake @@ -17,9 +17,19 @@ MACRO(DEAL_II_INITIALIZE_CACHED_VARIABLES) "Choose the type of build, options are: Debug, Release" ) - SET(CMAKE_CXX_FLAGS ${DEAL_II_CXX_FLAGS}) - SET(CMAKE_CXX_FLAGS_RELEASE ${DEAL_II_CXX_FLAGS_RELEASE}) - SET(CMAKE_CXX_FLAGS_DEBUG ${DEAL_II_CXX_FLAGS_DEBUG}) + SET(CMAKE_CXX_FLAGS ${DEAL_II_CXX_FLAGS} CACHE STRING + "Flags used by the compiler during all build types." + ) + + SET(CMAKE_CXX_FLAGS_DEBUG ${DEAL_II_CXX_FLAGS_DEBUG} CACHE STRING + "Flags used by the compiler during debug builds." + ) + + SET(CMAKE_CXX_FLAGS_RELEASE ${DEAL_II_CXX_FLAGS_RELEASE} CACHE STRING + "Flags used by the compiler during release builds." + ) + + MARK_AS_ADVANCED(CMAKE_INSTALL_PREFIX) ENDMACRO() -- 2.39.5