From 50dbcdcf1f94a63eca5e4dfb8636bbb619d2df62 Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 24 Sep 2012 19:37:10 +0000 Subject: [PATCH] Make Wolfgang happy #3 git-svn-id: https://svn.dealii.org/branches/branch_cmake@26679 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/setup_deal_ii.cmake | 40 ++++++++++++++++++------------- deal.II/config/CMakeLists.txt | 10 ++------ deal.II/config/Config.cmake.in | 23 +++++++++++++----- 3 files changed, 42 insertions(+), 31 deletions(-) diff --git a/deal.II/cmake/setup_deal_ii.cmake b/deal.II/cmake/setup_deal_ii.cmake index 44cd99ca52..b24210b33a 100644 --- a/deal.II/cmake/setup_deal_ii.cmake +++ b/deal.II/cmake/setup_deal_ii.cmake @@ -20,16 +20,11 @@ STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" DEAL_II_VERSION_MINOR "${VERSION}" ) -# -# Set the library and project name depending on build type: -# -IF(CMAKE_BUILD_TYPE MATCHES "Debug") - SET_IF_EMPTY(DEAL_II_BASE_NAME "deal_II.g") - SET_IF_EMPTY(DEAL_II_PROJECT_CONFIG_NAME "${DEAL_II_PACKAGE_NAME}_DEBUG") -ELSE() - SET_IF_EMPTY(DEAL_II_BASE_NAME "deal_II") - SET_IF_EMPTY(DEAL_II_PROJECT_CONFIG_NAME "${DEAL_II_PACKAGE_NAME}") -ENDIF() +SET(DEAL_II_PROJECT_CONFIG_NAME "${DEAL_II_PACKAGE_NAME}") + +SET_IF_EMPTY(DEAL_II_BASE_NAME "deal_II") + +SET_IF_EMPTY(DEAL_II_DEBUG_SUFFIX ".g") SET(DEAL_II_PATH ${CMAKE_INSTALL_PREFIX}) @@ -55,24 +50,35 @@ ELSE() SET_IF_EMPTY(DEAL_II_PROJECT_CONFIG_RELDIR "${DEAL_II_LIBRARY_RELDIR}/cmake/${DEAL_II_PROJECT_CONFIG_NAME}") ENDIF() + LIST(APPEND DEAL_II_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${DEAL_II_INCLUDE_RELDIR}" ) + # # The library name: # + IF(BUILD_SHARED_LIBS) - SET(DEAL_II_LIBRARY_NAME - ${CMAKE_SHARED_LIBRARY_PREFIX}${DEAL_II_BASE_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} - ) + SET(DEAL_II_LIBRARY_NAME_RELEASE ${CMAKE_SHARED_LIBRARY_PREFIX}${DEAL_II_BASE_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ) + SET(DEAL_II_LIBRARY_NAME_DEBUG ${CMAKE_SHARED_LIBRARY_PREFIX}${DEAL_II_BASE_NAME}${DEAL_II_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX} ) ELSE() - SET(DEAL_II_LIBRARY_NAME - ${CMAKE_STATIC_LIBRARY_PREFIX}${DEAL_II_BASE_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX} - ) + SET(DEAL_II_LIBRARY_NAME_RELEASE ${CMAKE_STATIC_LIBRARY_PREFIX}${DEAL_II_BASE_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX} ) + SET(DEAL_II_LIBRARY_NAME_DEBUG ${CMAKE_STATIC_LIBRARY_PREFIX}${DEAL_II_BASE_NAME}${DEAL_II_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} ) ENDIF() +LIST(APPEND DEAL_II_LIBRARIES_DEBUG + "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_DEBUG}" + ) +LIST(APPEND DEAL_II_LIBRARIES_RELEASE + "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_RELEASE}" + ) + LIST(APPEND DEAL_II_LIBRARIES - "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME}" + DEBUG + "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_DEBUG}" + RELEASE + "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_RELEASE}" ) diff --git a/deal.II/config/CMakeLists.txt b/deal.II/config/CMakeLists.txt index 58b638420a..2861ba1842 100644 --- a/deal.II/config/CMakeLists.txt +++ b/deal.II/config/CMakeLists.txt @@ -58,7 +58,7 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) ) # - # Add an rpath directive inf front of each library, so that libraries + # Add an rpath directive in front of each library, so that libraries # outside of the default search directories will be found by the runtime # dynamic linker: # @@ -99,13 +99,8 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/Make.global_options.in - ${CMAKE_CURRENT_BINARY_DIR}/Make.global_options.${CMAKE_BUILD_TYPE} - ) - - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/Make.global_options.stub ${CMAKE_CURRENT_BINARY_DIR}/Make.global_options - COPYONLY) + ) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/Version.in @@ -114,7 +109,6 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/template-arguments - ${CMAKE_CURRENT_BINARY_DIR}/Make.global_options.${CMAKE_BUILD_TYPE} ${CMAKE_CURRENT_BINARY_DIR}/Make.global_options DESTINATION common COMPONENT compat_files diff --git a/deal.II/config/Config.cmake.in b/deal.II/config/Config.cmake.in index 16bb1e2b02..ee053f6914 100644 --- a/deal.II/config/Config.cmake.in +++ b/deal.II/config/Config.cmake.in @@ -41,35 +41,46 @@ SET(DEAL_II_PROJECT_CONFIG_RELDIR "${DEAL_II_PROJECT_CONFIG_RELDIR}") SET(DEAL_II_BUILD_TYPE "${CMAKE_BUILD_TYPE}") SET(DEAL_II_CXX_COMPILER "${CMAKE_CXX_COMPILER}") -SET(DEAL_II_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}") +SET(DEAL_II_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +SET(DEAL_II_CXX_FLAGS_DEBUG "${DEAL_II_CXX_FLAGS_DEBUG}") +SET(DEAL_II_CXX_FLAGS_RELEASE "${DEAL_II_CXX_FLAGS_RELEASE}") SET(DEAL_II_C_COMPILER "${CMAKE_C_COMPILER}") -SET(DEAL_II_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}") +SET(DEAL_II_C_FLAGS "${CMAKE_C_FLAGS}") +SET(DEAL_II_C_FLAGS_DEBUG "${DEAL_II_C_FLAGS_DEBUG}") +SET(DEAL_II_C_FLAGS_RELEASE "${DEAL_II_C_FLAGS_RELEASE}") SET(DEAL_II_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") +SET(DEAL_II_LINKER_FLAGS_DEBUG "${DEAL_II_SHARED_LINKER_FLAGS_DEBUG}") +SET(DEAL_II_LINKER_FLAGS_RELEASE "${DEAL_II_SHARED_LINKER_FLAGS_RELEASE}") SET(DEAL_II_LINKER "${CMAKE_LINKER}") SET(DEAL_II_AR "${CMAKE_AR}") # -# Information on where to find the deal.II library and headers +# Information on where to find the deal.II libraries and headers # SET(DEAL_II_INCLUDE_DIRS "${DEAL_II_INCLUDE_DIRS}") - SET(DEAL_II_LIBRARIES "${DEAL_II_LIBRARIES}") +SET(DEAL_II_LIBRARIES_DEBUG "${DEAL_II_LIBRARIES_DEBUG}") +SET(DEAL_II_LIBRARIES_RELEASE "${DEAL_II_LIBRARIES_RELEASE}") # # External libraries we have to link against # -SET(DEAL_II_EXTERNAL_INCLUDE_DIRS "${DEAL_II_EXTERNAL_INCLUDE_DIRS}") +SET(DEAL_II_EXTERNAL_INCLUDE_DIRS "${DEAL_II_USER_INCLUDE_DIRS}") SET(DEAL_II_EXTERNAL_LIBRARIES "${DEAL_II_EXTERNAL_LIBRARIES}") +SET(DEAL_II_EXTERNAL_LIBRARIES_DEBUG "${DEAL_II_EXTERNAL_LIBRARIES_DEBUG}") +SET(DEAL_II_EXTERNAL_LIBRARIES_RELEASE "${DEAL_II_EXTERNAL_LIBRARIES_RELEASE}") -SET(DEAL_II_EXTERNAL_DEFINITIONS "${DEAL_II_EXTERNAL_DEFINITIONS}") +SET(DEAL_II_EXTERNAL_DEFINITIONS "${DEAL_II_USER_DEFINITIONS}") +SET(DEAL_II_EXTERNAL_DEFINITIONS_DEBUG "${DEAL_II_USER_DEFINITIONS_DEBUG}") +SET(DEAL_II_EXTERNAL_DEFINITIONS_RELEASE "${DEAL_II_USER_DEFINITIONS_RELEASE}") # -- 2.39.5