]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfixes
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 26 Sep 2012 14:49:19 +0000 (14:49 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 26 Sep 2012 14:49:19 +0000 (14:49 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26751 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/README.CMAKE [moved from deal.II/README_CMAKE with 99% similarity]
deal.II/TODO.CMAKE [moved from deal.II/TODO_CMAKE with 100% similarity]
deal.II/cmake/configure/configure_petsc.cmake
deal.II/cmake/macros/macro_deal_ii_setup_target.cmake
deal.II/config/CMakeLists.txt

similarity index 99%
rename from deal.II/README_CMAKE
rename to deal.II/README.CMAKE
index 94dc31ee50181b06629b2be421a79bba74b5ad55..c47678c4df119cb4731dcd3655837a3f450f3bf9 100644 (file)
@@ -544,7 +544,7 @@ How to use deal.II in your cmake project
 
         INCLUDE(${DEAL_II_MACROS})
 
-        DEAL_II_INITIALIZE_CACHED_VARIABLES()
+        DEAL_II_INITIALIZE_VARIABLES()
 
         PROJECT(step-1)
 
similarity index 100%
rename from deal.II/TODO_CMAKE
rename to deal.II/TODO.CMAKE
index c8ba9ff8dcc40bda80925cf0309c0b45b41b30a9..f2a8d980e62d313abeacb9079beddba42b5d86fa 100644 (file)
@@ -50,6 +50,9 @@ MACRO(FEATURE_PETSC_CONFIGURE_EXTERNAL var)
 
   INCLUDE_DIRECTORIES(${PETSC_INCLUDE_DIRS})
 
+  # The user has to know the location of the petsc headers as well:
+  LIST(APPEND DEAL_II_USER_INCLUDE_DIRS ${PETSC_INCLUDE_DIRS})
+
   LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES
     ${PETSC_LIBRARIES}
     )
index ecab7c8980963400b339083687b30590e0250351..7de8191e401269d74c5ef2e0b8945c5caf8d3579 100644 (file)
 
 MACRO(DEAL_II_SETUP_TARGET target)
 
+  CMAKE_MINIMUM_REQUIRED(2.8.8)
+
   SET_TARGET_PROPERTIES(${target} PROPERTIES
     INCLUDE_DIRECTORIES
-      "${DEAL_II_INCLUDE_DIRS};${DEAL_II_EXTERNAL_INCLUDE_DIRS}"
+      "${DEAL_II_EXTERNAL_INCLUDE_DIRS};${DEAL_II_INCLUDE_DIRS}"
     LINK_FLAGS
       "${DEAL_II_LINKER_FLAGS}"
     LINK_FLAGS_DEBUG
index b2e7c7b4eced5d17cbe1cb60d986dfe13171b320..3da5233bed9566f86a55455089e93f5ed0e78e5f 100644 (file)
@@ -44,9 +44,12 @@ IF(DEAL_II_COMPONENT_PROJECT_CONFIG)
   # Include the convenience macros directly at the end of our project
   # config:
   #
-  FOREACH(var ${DEAL_II_MARCROS})
+  FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}Config.cmake
+    "\n#\n# Include some convenience macros directly in the project config:\n#\n"
+    )
+  FOREACH(var ${DEAL_II_MACROS})
     FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}Config.cmake
-      "\nINCLUDE(${var})"
+      "INCLUDE(${var})\n"
       )
   ENDFOREACH()
 

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.