]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 20:51:23 +0000 (20:51 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 20:51:23 +0000 (20:51 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26613 0785d39b-7218-0410-832d-ea1e28bc413d

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

index 9976f74394229ebb6cbdfeb5daf955d021cc4095..5f846a2c8bc0cac252d081d6dc438fc982d4ddeb 100644 (file)
@@ -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()
 
 #
index a04c04e069cee8988a395fa28176fd9175209ebd..de51817857a62a209ced3195f1e2aeade5fb3425 100644 (file)
@@ -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
     )
index 08f6ce77197d42311789f1e5c75ba094a8de8870..166720fee8b2d993fc3c2e2a1c453932c678ac67 100644 (file)
@@ -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}")

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.