]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
CMake: Bugfix. Use relative paths in deal.IIConfig.cmake
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 29 Mar 2013 07:43:25 +0000 (07:43 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 29 Mar 2013 07:43:25 +0000 (07:43 +0000)
git-svn-id: https://svn.dealii.org/trunk@29110 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/config/CMakeLists.txt
deal.II/cmake/config/Make.global_options.in
deal.II/cmake/setup_deal_ii.cmake
deal.II/source/CMakeLists.txt

index 3b1d006f1a7c7748506b98516ab062aa896bbc13..bcd1f300b245d39c8030b0ec4804fc7a840cae5c 100644 (file)
@@ -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}}
         )
index 23ab22b925d91a9a479e590f481b5cbcf7a066e8..bcedebb257f9ca1ec1ee8e69b9ccc4aa2650dc4e 100644 (file)
@@ -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@
index 9742ac9d84455c6187e5f2003c57ed2e1cc04aab..5644fa08bc37fb9ffe2ece25773e1ae3f5f7acb6 100644 (file)
@@ -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")
index be8ff512f307eab973e268608a1b0d8b4855e470..3118888674baaabb645b0bef1d0e4bfe74ddb364 100644 (file)
@@ -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

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.