From 82ac1dd2d2b992420ed0a463a34bd4180da15169 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 21 Sep 2012 20:51:23 +0000 Subject: [PATCH] Bugfix git-svn-id: https://svn.dealii.org/branches/branch_cmake@26613 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/setup_deal_ii.cmake | 5 ++--- deal.II/config/CMakeLists.txt | 10 +++++----- deal.II/config/Config.cmake.in | 2 ++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/deal.II/cmake/setup_deal_ii.cmake b/deal.II/cmake/setup_deal_ii.cmake index 9976f74394..5f846a2c8b 100644 --- a/deal.II/cmake/setup_deal_ii.cmake +++ b/deal.II/cmake/setup_deal_ii.cmake @@ -49,13 +49,12 @@ LIST(APPEND DEAL_II_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${DEAL_II_INCLUDE_RELDIR}" ) -# -# The base name: -# IF(CMAKE_BUILD_TYPE MATCHES "Debug") SET(DEAL_II_BASE_NAME "deal_II.g") + SET(DEAL_II_PROJECT_NAME "deal.II.g") ELSE() SET(DEAL_II_BASE_NAME "deal_II") + SET(DEAL_II_PROJECT_NAME "deal.II") ENDIF() # diff --git a/deal.II/config/CMakeLists.txt b/deal.II/config/CMakeLists.txt index a04c04e069..de51817857 100644 --- a/deal.II/config/CMakeLists.txt +++ b/deal.II/config/CMakeLists.txt @@ -11,13 +11,13 @@ IF(DEAL_II_COMPONENT_PROJECT_CONFIG) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_BASE_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_NAME}Config.cmake ) GET_CMAKE_PROPERTY(res VARIABLES) FOREACH(var ${res}) IF(var MATCHES "DEAL_II_WITH") - FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_BASE_NAME}Config.cmake + FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_NAME}Config.cmake "SET(${var} ${${var}})\n" ) ENDIF() @@ -25,13 +25,13 @@ IF(DEAL_II_COMPONENT_PROJECT_CONFIG) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/ConfigVersion.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_BASE_NAME}ConfigVersion.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_NAME}ConfigVersion.cmake @ONLY ) INSTALL(FILES - ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_BASE_NAME}Config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_BASE_NAME}ConfigVersion.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_NAME}ConfigVersion.cmake DESTINATION ${DEAL_II_PROJECT_CONFIG_RELDIR} COMPONENT project_config ) diff --git a/deal.II/config/Config.cmake.in b/deal.II/config/Config.cmake.in index 08f6ce7719..166720fee8 100644 --- a/deal.II/config/Config.cmake.in +++ b/deal.II/config/Config.cmake.in @@ -7,6 +7,8 @@ # General information # +SET(DEAL_II_PROJECT_NAME "${DEAL_II_PROJECT_NAME}") + SET(DEAL_II_VERSION "${DEAL_II_MAJOR}.${DEAL_II_MINOR}") SET(DEAL_II_MAJOR "${DEAL_II_MAJOR}") SET(DEAL_II_MINOR "${DEAL_II_MINOR}") -- 2.39.5