]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfixes...
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 2 Oct 2012 23:09:55 +0000 (23:09 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 2 Oct 2012 23:09:55 +0000 (23:09 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26932 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/macros/macro_deal_ii_initialize_cached_variables.cmake
deal.II/cmake/macros/macro_deal_ii_setup_compiler.cmake [deleted file]
deal.II/config/CMakeLists.txt

index 1ae4d8680940d4db8aba2201563722789d504557..a8a90eae3b78a2a79e3e6b49b51a5b2c167f19c9 100644 (file)
@@ -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 (file)
index 927c987..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#####
-##
-## Copyright (C) 2012 by the deal.II authors
-##
-## This file is part of the deal.II library.
-##
-## <TODO: Full License information>
-## This file is dual licensed under QPL 1.0 and LGPL 2.1 or any later
-## version of the LGPL license.
-##
-## Author: Matthias Maier <matthias.maier@iwr.uni-heidelberg.de>
-##
-#####
-
-#
-# 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()
-
index 7ff063d60cb8408df187ed6267ebf4f5a3e04e4e..c0edebc0ba603b51775f7b964bca6343cc5da033 100644 (file)
@@ -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

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.