src/CMakeLists.txt: Enable multiarch for the cmake files
authorPunit Agrawal <punit1.agrawal@toshiba.co.jp>
Thu, 8 Apr 2021 01:38:10 +0000 (10:38 +0900)
committerNobuhiro Iwamatsu <iwamatsu@debian.org>
Wed, 22 Dec 2021 08:29:11 +0000 (08:29 +0000)
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

CMakeLists.txt
src/CMakeLists.txt

index ef54e12ef10760abf14356c7d54295229553b2b9..4ab2e77f732932fee97aad7454edb0a758a08efa 100644 (file)
@@ -26,7 +26,7 @@ find_package(unilog REQUIRED)
 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}")
@@ -42,7 +42,7 @@ write_basic_package_version_file(
 install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
   "${CMAKE_CURRENT_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)
index 217c6bcee679a19806623aa9d69e6c5c2678437e..668a695ed212820485b108d397e7cd59ec4e288d 100644 (file)
@@ -67,4 +67,4 @@ install(
 install(
   EXPORT ${PROJECT_NAME}-targets
   NAMESPACE ${PROJECT_NAME}::
-  DESTINATION share/cmake/${PROJECT_NAME})
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})