From 145860e178e127a0a657619f485fc0ef966bb58e Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 2 Oct 2012 23:09:55 +0000 Subject: [PATCH] Bugfixes... git-svn-id: https://svn.dealii.org/branches/branch_cmake@26932 0785d39b-7218-0410-832d-ea1e28bc413d --- ..._deal_ii_initialize_cached_variables.cmake | 3 ++ .../macros/macro_deal_ii_setup_compiler.cmake | 36 ------------------- deal.II/config/CMakeLists.txt | 2 -- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 deal.II/cmake/macros/macro_deal_ii_setup_compiler.cmake 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 1ae4d86809..a8a90eae3b 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 @@ -39,6 +39,9 @@ MACRO(DEAL_II_INITIALIZE_CACHED_VARIABLES) "Choose the type of build, options are: Debug, Release" ) + SET(CMAKE_CXX_COMPILER ${DEAL_II_CXX_COMPILER} CACHE STRING + "CXX Compiler.") + SET(CMAKE_CXX_FLAGS ${DEAL_II_CXX_FLAGS} CACHE STRING "Flags used by the compiler during all build types." ) diff --git a/deal.II/cmake/macros/macro_deal_ii_setup_compiler.cmake b/deal.II/cmake/macros/macro_deal_ii_setup_compiler.cmake deleted file mode 100644 index 927c987fa8..0000000000 --- a/deal.II/cmake/macros/macro_deal_ii_setup_compiler.cmake +++ /dev/null @@ -1,36 +0,0 @@ -##### -## -## Copyright (C) 2012 by the deal.II authors -## -## This file is part of the deal.II library. -## -## -## This file is dual licensed under QPL 1.0 and LGPL 2.1 or any later -## version of the LGPL license. -## -## Author: Matthias Maier -## -##### - -# -# This file implements the DEAL_II_SETUP_COMPILER macro, which is -# part of the deal.II library. -# -# Usage: -# DEAL_II_SETUP_COMPILER() -# - -MACRO(DEAL_II_SETUP_COMPILER) - - IF(NOT DEAL_II_PROJECT_CONFIG_INCLUDE) - MESSAGE(FATAL_ERROR - "DEAL_II_SETUP_TARGET can only be called in external projects after " - "the inclusion of deal.IIConfig.cmake. It is not intended for " - "internal use." - ) - ENDIF() - - SET(CMAKE_CXX_COMPILER ${DEAL_II_CXX_COMPILER}) - -ENDMACRO() - diff --git a/deal.II/config/CMakeLists.txt b/deal.II/config/CMakeLists.txt index 7ff063d60c..c0edebc0ba 100644 --- a/deal.II/config/CMakeLists.txt +++ b/deal.II/config/CMakeLists.txt @@ -23,13 +23,11 @@ CONFIGURE_FILE( LIST(APPEND DEAL_II_MACROS ${CMAKE_INSTALL_PREFIX}/${DEAL_II_CMAKE_MACROS_RELDIR}/macro_deal_ii_initialize_cached_variables.cmake - ${CMAKE_INSTALL_PREFIX}/${DEAL_II_CMAKE_MACROS_RELDIR}/macro_deal_ii_setup_compiler.cmake ${CMAKE_INSTALL_PREFIX}/${DEAL_II_CMAKE_MACROS_RELDIR}/macro_deal_ii_setup_target.cmake ) INSTALL(FILES ${CMAKE_SOURCE_DIR}/cmake/macros/macro_deal_ii_initialize_cached_variables.cmake - ${CMAKE_SOURCE_DIR}/cmake/macros/macro_deal_ii_setup_compiler.cmake ${CMAKE_SOURCE_DIR}/cmake/macros/macro_deal_ii_setup_target.cmake DESTINATION ${DEAL_II_CMAKE_MACROS_RELDIR} COMPONENT library -- 2.39.5