]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Print some status information in deal.IIConfig.cmake
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 15 Oct 2012 17:15:09 +0000 (17:15 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 15 Oct 2012 17:15:09 +0000 (17:15 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27127 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/config/CMakeLists.txt
deal.II/config/Config.cmake.in

index 518ee9ab0333fb4d572625ede829475f2960c641..8d000f64e2d2b078895ca0c4c9c9c3373390b400 100644 (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_target.cmake
-  )
 
 INSTALL(FILES
   ${CMAKE_SOURCE_DIR}/cmake/macros/macro_deal_ii_initialize_cached_variables.cmake
@@ -93,19 +89,6 @@ FOREACH(var ${res})
   ENDIF()
 ENDFOREACH()
 
-#
-# Include convenience macros directly at the end of our project config:
-#
-FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}Config.cmake
-  "\n\n#\n# Include some convenience macros directly in the project config:\n#\n\n"
-  )
-FOREACH(var ${DEAL_II_MACROS})
-  FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}Config.cmake
-    "INCLUDE(${var})\n"
-    )
-ENDFOREACH()
-
-
 CONFIGURE_FILE(
   ${CMAKE_CURRENT_SOURCE_DIR}/ConfigVersion.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}ConfigVersion.cmake
@@ -126,6 +109,7 @@ INSTALL(FILES
 #                                                                         #
 ###########################################################################
 
+
 IF(DEAL_II_COMPONENT_COMPAT_FILES)
   #
   # Transform some cmake lists into a string that the old Makefile
index 2cca02a0632e153912d2c24bd5737cb00933460f..7513dc00f97863a79d3c73abeb025aaec1b1fad8 100644 (file)
@@ -19,8 +19,6 @@
 ##                                                                      ##
 ##########################################################################
 
-SET(DEAL_II_PROJECT_CONFIG_INCLUDED TRUE)
-
 
 #
 # General information
@@ -54,6 +52,34 @@ SET(DEAL_II_LIBRARY_RELDIR "@DEAL_II_LIBRARY_RELDIR@")
 SET(DEAL_II_PROJECT_CONFIG_RELDIR "@DEAL_II_PROJECT_CONFIG_RELDIR@")
 
 
+#
+# Print a message after inclusion of this file:
+#
+
+SET(DEAL_II_PROJECT_CONFIG_INCLUDED TRUE)
+
+IF(NOT ${DEAL_II_PACKAGE_NAME}_FIND_QUIETLY)
+  MESSAGE(STATUS
+    "Using the ${DEAL_II_PACKAGE_NAME}-${DEAL_II_PACKAGE_VERSION} installation found at ${DEAL_II_PATH}"
+    )
+ENDIF()
+
+
+#
+# Include all convenience macros:
+#
+
+FILE(GLOB _macro_files
+  "${DEAL_II_PATH}/${DEAL_II_CMAKE_MACROS_RELDIR}/*.cmake"
+  )
+FOREACH(file ${_macro_files})
+  IF(NOT ${DEAL_II_PACKAGE_NAME}_FIND_QUIETLY)
+    MESSAGE(STATUS "Include macro ${file}")
+  ENDIF()
+  INCLUDE(${file})
+ENDFOREACH()
+
+
 #
 # Compiler and linker configuration
 #

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.