From 1bd27b2d3a07b0abb399ca457fb6448da989de26 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 29 Mar 2013 07:43:25 +0000 Subject: [PATCH] CMake: Bugfix. Use relative paths in deal.IIConfig.cmake git-svn-id: https://svn.dealii.org/trunk@29110 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/config/CMakeLists.txt | 20 ++++++++++++++++---- deal.II/cmake/config/Make.global_options.in | 2 +- deal.II/cmake/setup_deal_ii.cmake | 15 --------------- deal.II/source/CMakeLists.txt | 8 -------- 4 files changed, 17 insertions(+), 28 deletions(-) diff --git a/deal.II/cmake/config/CMakeLists.txt b/deal.II/cmake/config/CMakeLists.txt index 3b1d006f1a..bcd1f300b2 100644 --- a/deal.II/cmake/config/CMakeLists.txt +++ b/deal.II/cmake/config/CMakeLists.txt @@ -66,8 +66,15 @@ FOREACH(_build ${DEAL_II_BUILD_TYPES}) ENDIF() ENDIF() + + # + # Get library name directly from the target: + # + GET_TARGET_PROPERTY(_lib ${DEAL_II_BASE_NAME}${DEAL_II_${_build}_SUFFIX} LOCATION) + GET_FILENAME_COMPONENT(CONFIG_LIBRARY_${_build} "${_lib}" NAME) + SET(CONFIG_LIBRARIES_${_build} - ${MAKEFILE_LIBRARY_${_build}} + \${DEAL_II_PATH}/\${DEAL_II_LIBRARY_RELDIR}/${CONFIG_LIBRARY_${_build}} ${DEAL_II_EXTERNAL_LIBRARIES} ${DEAL_II_EXTERNAL_LIBRARIES_${_build}} ) @@ -86,7 +93,9 @@ FOREACH(_build ${DEAL_II_BUILD_TYPES}) ENDFOREACH() SET(CONFIG_INCLUDE_DIRS - ${DEAL_II_INCLUDE_DIRS} + \${DEAL_II_PATH}/\${DEAL_II_INCLUDE_RELDIR} + \${DEAL_II_PATH}/\${DEAL_II_INCLUDE_RELDIR}/deal.II + \${DEAL_II_PATH}/\${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled ${DEAL_II_USER_INCLUDE_DIRS} ) @@ -141,6 +150,9 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) # mechanism actually understands: TO_STRING_AND_ADD_PREFIX(MAKEFILE_INCLUDE_DIRS "${CMAKE_INCLUDE_FLAG_CXX}" + $(D)/${DEAL_II_INCLUDE_RELDIR} + $(D)/${DEAL_II_INCLUDE_RELDIR}/deal.II + $(D)/${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled ${DEAL_II_USER_INCLUDE_DIRS} ${DEAL_II_INCLUDE_DIRS} ) @@ -153,7 +165,7 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) ) TO_STRING(MAKEFILE_TARGETS_${build} - ${MAKEFILE_LIBRARY_${build}} + $(D)/${DEAL_II_LIBRARY_RELDIR}/${CONFIG_LIBRARY_${build}} ${DEAL_II_EXTERNAL_LIBRARIES} ${DEAL_II_EXTERNAL_LIBRARIES_${build}} ) @@ -163,7 +175,7 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) # CMake... # FOREACH(_lib - ${MAKEFILE_LIBRARY_${build}} + $(D)/${DEAL_II_LIBRARY_RELDIR}/${CONFIG_LIBRARY_${build}} ${DEAL_II_EXTERNAL_LIBRARIES} ${DEAL_II_EXTERNAL_LIBRARIES_${build}} ) diff --git a/deal.II/cmake/config/Make.global_options.in b/deal.II/cmake/config/Make.global_options.in index 23ab22b925..bcedebb257 100644 --- a/deal.II/cmake/config/Make.global_options.in +++ b/deal.II/cmake/config/Make.global_options.in @@ -32,7 +32,7 @@ else LIBS = @MAKEFILE_LIBS_RELEASE@ endif -LIBDIR = @CMAKE_INSTALL_PREFIX@/@DEAL_II_LIBRARY_RELDIR@ +LIBDIR = $(D)/@DEAL_II_LIBRARY_RELDIR@ enable-threads = @MAKEFILE_enablethreads@ enable-shared = @MAKEFILE_enableshared@ diff --git a/deal.II/cmake/setup_deal_ii.cmake b/deal.II/cmake/setup_deal_ii.cmake index 9742ac9d84..5644fa08bc 100644 --- a/deal.II/cmake/setup_deal_ii.cmake +++ b/deal.II/cmake/setup_deal_ii.cmake @@ -38,7 +38,6 @@ # DEAL_II_DEBUG_SUFFIX *) # DEAL_II_RELEASE_SUFFIX *) # -# DEAL_II_PATH *) # DEAL_II_CMAKE_MACROS_RELDIR *) # DEAL_II_DOCHTML_RELDIR *) # DEAL_II_DOCREADME_RELDIR *) @@ -48,9 +47,6 @@ # DEAL_II_LIBRARY_RELDIR *) # DEAL_II_PROJECT_CONFIG_RELDIR *) # -# DEAL_II_INCLUDE_DIRS -# DEAL_II_LIBRARY_DIRS -# # DEAL_II_BUILD_TYPES # DEAL_II_WITH_BUNDLED_DIRECTORY # DEAL_II_WITH_DOC_DIRECTORY @@ -92,8 +88,6 @@ SET_IF_EMPTY(DEAL_II_BASE_NAME "${_base_name}") SET_IF_EMPTY(DEAL_II_DEBUG_SUFFIX ".g") SET_IF_EMPTY(DEAL_II_RELEASE_SUFFIX "") -SET(DEAL_II_PATH ${CMAKE_INSTALL_PREFIX}) - IF(DEAL_II_COMPONENT_COMPAT_FILES) # # The good, old directory structure: @@ -123,15 +117,6 @@ 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}" - "${CMAKE_INSTALL_PREFIX}/${DEAL_II_INCLUDE_RELDIR}/deal.II" - "${CMAKE_INSTALL_PREFIX}/${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled" - ) - -LIST(APPEND DEAL_II_LIBRARY_DIRS - "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}" - ) IF(CMAKE_BUILD_TYPE MATCHES "Debug") LIST(APPEND DEAL_II_BUILD_TYPES "DEBUG") diff --git a/deal.II/source/CMakeLists.txt b/deal.II/source/CMakeLists.txt index be8ff512f3..3118888674 100644 --- a/deal.II/source/CMakeLists.txt +++ b/deal.II/source/CMakeLists.txt @@ -88,14 +88,6 @@ FOREACH(build ${DEAL_II_BUILD_TYPES}) DESTINATION ${DEAL_II_LIBRARY_RELDIR} COMPONENT library ) - - # - # Information for legacy Make.global_options - # - GET_TARGET_PROPERTY(lib ${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX} LOCATION) - GET_FILENAME_COMPONENT(lib "${lib}" NAME) - SET(MAKEFILE_LIBRARY_${build} "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${lib}" PARENT_SCOPE) - ENDFOREACH() INSTALL(EXPORT ${DEAL_II_PROJECT_CONFIG_NAME}Targets -- 2.39.5