From 54daaf6a99aad1cdfe735417dd67457fe7a75083 Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 1 Oct 2012 14:12:32 +0000 Subject: [PATCH] Update git-svn-id: https://svn.dealii.org/branches/branch_cmake@26910 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/config/Config.cmake.in | 39 ++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/deal.II/config/Config.cmake.in b/deal.II/config/Config.cmake.in index e921c0d2ad..f76af16792 100644 --- a/deal.II/config/Config.cmake.in +++ b/deal.II/config/Config.cmake.in @@ -33,6 +33,7 @@ SET(DEAL_II_PATH "${DEAL_II_PATH}") SET(DEAL_II_CMAKE_MACROS_RELDIR "${DEAL_II_CMAKE_MACROS_RELDIR}") SET(DEAL_II_DOCUMENTATION_RELDIR "${DEAL_II_DOCUMENTATION_RELDIR}") SET(DEAL_II_EXAMPLES_RELDIR "${DEAL_II_EXAMPLES_RELDIR}") +SET(DEAL_II_EXECUTABLE_RELDIR "${DEAL_II_EXECUTABLE_RELDIR}") SET(DEAL_II_INCLUDE_RELDIR "${DEAL_II_INCLUDE_RELDIR}") SET(DEAL_II_LIBRARY_RELDIR "${DEAL_II_LIBRARY_RELDIR}") SET(DEAL_II_PROJECT_CONFIG_RELDIR "${DEAL_II_PROJECT_CONFIG_RELDIR}") @@ -46,21 +47,43 @@ SET(DEAL_II_BUILD_TYPE "${CMAKE_BUILD_TYPE}") SET(DEAL_II_BUILD_TYPES "${CMAKE_BUILD_TYPES}") SET(DEAL_II_CXX_COMPILER "${CMAKE_CXX_COMPILER}") + +# used for all targets: SET(DEAL_II_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + +# _additionally_ used for debug targets: SET(DEAL_II_CXX_FLAGS_DEBUG "${DEAL_II_CXX_FLAGS_DEBUG}") + +# _additionally_ used for release targets: SET(DEAL_II_CXX_FLAGS_RELEASE "${DEAL_II_CXX_FLAGS_RELEASE}") SET(DEAL_II_C_COMPILER "${CMAKE_C_COMPILER}") + +# used for all targets: SET(DEAL_II_C_FLAGS "${CMAKE_C_FLAGS}") + +# _additionally_ used for debug targets: SET(DEAL_II_C_FLAGS_DEBUG "${DEAL_II_C_FLAGS_DEBUG}") + +# _additionally_ used for release targets: SET(DEAL_II_C_FLAGS_RELEASE "${DEAL_II_C_FLAGS_RELEASE}") +# used for all targets: SET(DEAL_II_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") + +# _additionally_ used for debug targets: SET(DEAL_II_LINKER_FLAGS_DEBUG "${DEAL_II_SHARED_LINKER_FLAGS_DEBUG}") + +# _additionally_ used for release targets: SET(DEAL_II_LINKER_FLAGS_RELEASE "${DEAL_II_SHARED_LINKER_FLAGS_RELEASE}") +# used for all targets: SET(DEAL_II_USER_DEFINITIONS "${DEAL_II_USER_DEFINITIONS}") + +# _additionally_ used for debug targets: SET(DEAL_II_USER_DEFINITIONS_DEBUG "${DEAL_II_USER_DEFINITIONS_DEBUG}") + +# _additionally_ used for release targets: SET(DEAL_II_USER_DEFINITIONS_RELEASE "${DEAL_II_USER_DEFINITIONS_RELEASE}") @@ -70,8 +93,16 @@ SET(DEAL_II_USER_DEFINITIONS_RELEASE "${DEAL_II_USER_DEFINITIONS_RELEASE}") SET(DEAL_II_INCLUDE_DIRS "${DEAL_II_INCLUDE_DIRS}") +# +# The _full_ list of libraries with "general", "debug" and "optimized" +# keywords for easy use with TARGET_LINK_LIBRARIES: +# SET(DEAL_II_LIBRARIES "${DEAL_II_LIBRARIES}") + +# The full list of library/ies for the debug target: SET(DEAL_II_LIBRARIES_DEBUG "${DEAL_II_LIBRARIES_DEBUG}") + +# The full lis of libraries/ies for the release target: SET(DEAL_II_LIBRARIES_RELEASE "${DEAL_II_LIBRARIES_RELEASE}") @@ -81,8 +112,16 @@ SET(DEAL_II_LIBRARIES_RELEASE "${DEAL_II_LIBRARIES_RELEASE}") SET(DEAL_II_EXTERNAL_INCLUDE_DIRS "${DEAL_II_USER_INCLUDE_DIRS}") +# +# The _full_ list of libraries with "general", "debug" and "optimized" +# keywords for easy use with TARGET_LINK_LIBRARIES: +# SET(DEAL_II_EXTERNAL_LIBRARIES "${CONFIG_EXTERNAL_LIBRARIES}") + +# The full lis of libraries for the debug target: SET(DEAL_II_EXTERNAL_LIBRARIES_DEBUG "${CONFIG_EXTERNAL_LIBRARIES_DEBUG}") + +# The full lis of libraries for the release target: SET(DEAL_II_EXTERNAL_LIBRARIES_RELEASE "${CONFIG_EXTERNAL_LIBRARIES_RELEASE}") -- 2.39.5