[PATCH 3/3] src/CMakeLists.txt: Enable multiarch for the cmake files

The cmake files install path is hard coded which gets in the way of
enabling multiarch.

Fix this by respecting the standard CMAKE variable used to specify
library install location. This variable gets used during package
building to install the cmake files to multiarch aware location.

Gbp-Pq: Name 0003-src-CMakeLists.txt-Enable-multiarch-for-the-cmake-fi.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47e881baa059a2d9940fb406df56f2460f355890..ae44325232639bb0074ac25f526c6cc978458245 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ endif()
 add_subdirectory(src)
 
 file(RELATIVE_PATH REL_INCLUDE_DIR
-  ${CMAKE_INSTALL_PREFIX}/share/cmake/${PROJECT_NAME}
+  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
   ${CMAKE_INSTALL_PREFIX}/include)
 
 set(CONF_INCLUDE_DIRS "\${${PROJECT_NAME}_CMAKE_DIR}/${REL_INCLUDE_DIR}")
@@ -45,7 +45,7 @@ write_basic_package_version_file(
 install(FILES
   "${CMAKE_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
   "${CMAKE_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
-  DESTINATION share/cmake/${PROJECT_NAME})
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 
 if(BUILD_TEST)
   add_subdirectory(test)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e231dfdd78f6abfae55e409cf8537335bb90f799..bde8d9d8eea190a7c875cbec11163308be8dc988 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -91,4 +91,4 @@ install(
 install(
   EXPORT ${PROJECT_NAME}-targets
   NAMESPACE ${PROJECT_NAME}::
-  DESTINATION share/cmake/${PROJECT_NAME})
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})