From: maier Date: Mon, 15 Oct 2012 17:15:09 +0000 (+0000) Subject: Print some status information in deal.IIConfig.cmake X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=295fcb9ba9f072b0c27b2c5305ba5b3787b5e7fe;p=dealii-svn.git Print some status information in deal.IIConfig.cmake git-svn-id: https://svn.dealii.org/branches/branch_cmake@27127 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/config/CMakeLists.txt b/deal.II/config/CMakeLists.txt index 518ee9ab03..8d000f64e2 100644 --- a/deal.II/config/CMakeLists.txt +++ b/deal.II/config/CMakeLists.txt @@ -19,10 +19,6 @@ # # ########################################################################### -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 diff --git a/deal.II/config/Config.cmake.in b/deal.II/config/Config.cmake.in index 2cca02a063..7513dc00f9 100644 --- a/deal.II/config/Config.cmake.in +++ b/deal.II/config/Config.cmake.in @@ -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 #