From: maier Date: Wed, 26 Sep 2012 14:49:19 +0000 (+0000) Subject: Bugfixes X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4c3baf203a3fb918b74d2037e93e33f524177f5;p=dealii-svn.git Bugfixes git-svn-id: https://svn.dealii.org/branches/branch_cmake@26751 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/README_CMAKE b/deal.II/README.CMAKE similarity index 99% rename from deal.II/README_CMAKE rename to deal.II/README.CMAKE index 94dc31ee50..c47678c4df 100644 --- a/deal.II/README_CMAKE +++ b/deal.II/README.CMAKE @@ -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) diff --git a/deal.II/TODO_CMAKE b/deal.II/TODO.CMAKE similarity index 100% rename from deal.II/TODO_CMAKE rename to deal.II/TODO.CMAKE diff --git a/deal.II/cmake/configure/configure_petsc.cmake b/deal.II/cmake/configure/configure_petsc.cmake index c8ba9ff8dc..f2a8d980e6 100644 --- a/deal.II/cmake/configure/configure_petsc.cmake +++ b/deal.II/cmake/configure/configure_petsc.cmake @@ -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} ) diff --git a/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake b/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake index ecab7c8980..7de8191e40 100644 --- a/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake @@ -11,9 +11,11 @@ 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 diff --git a/deal.II/config/CMakeLists.txt b/deal.II/config/CMakeLists.txt index b2e7c7b4ec..3da5233bed 100644 --- a/deal.II/config/CMakeLists.txt +++ b/deal.II/config/CMakeLists.txt @@ -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()