use relocatable paths

ginkgo-project · Jan 18, 2024 · 67c2c1b · 67c2c1b
1 parent bb25a80
commit 67c2c1b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/cmake/GinkgoConfig.cmake.in b/cmake/GinkgoConfig.cmake.in
@@ -100,8 +100,8 @@ set(GINKGO_CUDA_HOST_COMPILER_SHORT "")  # dummy value to stay consistent
 set(GINKGO_EXPORT_BINARY_DIR "@GINKGO_EXPORT_BINARY_DIR@")
 if(NOT GINKGO_EXPORT_BINARY_DIR)
     set_and_check(GINKGO_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
-    set_and_check(GINKGO_INSTALL_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@")
-    set_and_check(GINKGO_INSTALL_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_FULL_LIBDIR@")
+    set_and_check(GINKGO_INSTALL_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
+    set_and_check(GINKGO_INSTALL_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
     set(GINKGO_INSTALL_RPATH_FOR_HIP "-Wl,-rpath,${GINKGO_INSTALL_LIBRARY_DIR}")
     set(GINKGO_INSTALL_RPATH @GINKGO_INSTALL_RPATH@)
     set(GINKGO_INSTALL_RPATH_USE_ORIGIN @GINKGO_INSTALL_RPATH_USE_ORIGIN@)

diff --git a/cmake/install_helpers.cmake b/cmake/install_helpers.cmake
@@ -2,9 +2,9 @@ include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 
 
-set(GINKGO_INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
-set(GINKGO_INSTALL_CONFIG_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/Ginkgo")
-set(GINKGO_INSTALL_MODULE_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/Ginkgo/Modules")
+set(GINKGO_INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+set(GINKGO_INSTALL_CONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/Ginkgo")
+set(GINKGO_INSTALL_MODULE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/Ginkgo/Modules")
 
 # This function adds the correct RPATH properties to a Ginkgo target.
 #
@@ -47,14 +47,14 @@ function(ginkgo_install_library name)
     install(TARGETS "${name}"
         EXPORT Ginkgo
         LIBRARY
-            DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+            DESTINATION "${CMAKE_INSTALL_LIBDIR}"
             COMPONENT Ginkgo_Runtime
             NAMELINK_COMPONENT Ginkgo_Development
         RUNTIME
-            DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+            DESTINATION "${CMAKE_INSTALL_BINDIR}"
             COMPONENT Ginkgo_Runtime
         ARCHIVE
-            DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+            DESTINATION "${CMAKE_INSTALL_LIBDIR}"
             COMPONENT Ginkgo_Development
         )
 endfunction()
@@ -68,29 +68,29 @@ function(ginkgo_install)
 
     # install the public header files
     install(DIRECTORY "${Ginkgo_SOURCE_DIR}/include/"
-        DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
         COMPONENT Ginkgo_Development
         FILES_MATCHING PATTERN "*.hpp"
         )
     install(FILES "${Ginkgo_BINARY_DIR}/include/ginkgo/config.hpp"
-        DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/ginkgo"
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ginkgo"
         COMPONENT Ginkgo_Development
         )
 
     if  (GINKGO_HAVE_HWLOC AND NOT HWLOC_FOUND)
         get_filename_component(HWLOC_LIB_PATH ${HWLOC_LIBRARIES} DIRECTORY)
         file(GLOB HWLOC_LIBS "${HWLOC_LIB_PATH}/libhwloc*")
         install(FILES ${HWLOC_LIBS}
-            DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+            DESTINATION "${CMAKE_INSTALL_LIBDIR}"
             COMPONENT Ginkgo_Runtime
             )
         # We only use hwloc and not netloc
         install(DIRECTORY "${HWLOC_INCLUDE_DIRS}/hwloc"
-            DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
+            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
             COMPONENT Ginkgo_Development
             )
         install(FILES "${HWLOC_INCLUDE_DIRS}/hwloc.h"
-            DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
+            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
             COMPONENT Ginkgo_Development
             )
     endif()
@@ -114,7 +114,7 @@ function(ginkgo_install)
         "${Ginkgo_SOURCE_DIR}/cmake/GinkgoConfig.cmake.in"
         "${Ginkgo_BINARY_DIR}/cmake/GinkgoConfig.cmake"
         INSTALL_DESTINATION "${GINKGO_INSTALL_CONFIG_DIR}"
-        PATH_VARS CMAKE_INSTALL_FULL_INCLUDEDIR CMAKE_INSTALL_FULL_LIBDIR CMAKE_INSTALL_PREFIX GINKGO_INSTALL_MODULE_DIR
+        PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_PREFIX GINKGO_INSTALL_MODULE_DIR
         )
     install(FILES
         "${Ginkgo_BINARY_DIR}/cmake/GinkgoConfig.cmake"
@@ -130,7 +130,7 @@ function(ginkgo_install)
     if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND BUILD_SHARED_LIBS)
         install(FILES
             "${Ginkgo_SOURCE_DIR}/dev_tools/scripts/gdb-ginkgo.py"
-            DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+            DESTINATION "${CMAKE_INSTALL_LIBDIR}"
             RENAME "$<TARGET_FILE_NAME:ginkgo>-gdb.py"
             COMPONENT Ginkgo_Development)
     endif()