harmonize_libdir_install

nicolaslg · nicolaslg · commit 0861705a13c1 · 2024-03-25T04:22:35.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -414,12 +414,11 @@ install(EXPORT GMDS_SUITE
         )
 
 set(INCLUDE_INSTALL_DIR include/)
-set(LIB_INSTALL_DIR lib/)
 
 include(CMakePackageConfigHelpers)
 configure_package_config_file(
         gmdsConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/gmdsConfig.cmake
-        INSTALL_DESTINATION ${LIB_INSTALL_DIR}/gmds/cmake
+        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/gmds/cmake
         PATH_VARS INCLUDE_INSTALL_DIR
 )
 
@@ -432,5 +431,5 @@ write_basic_package_version_file(
 install(FILES
         ${CMAKE_CURRENT_BINARY_DIR}/gmdsConfig.cmake
 #       ${CMAKE_CURRENT_BINARY_DIR}/gmdsConfigVersion.cmake
-        DESTINATION ${LIB_INSTALL_DIR}/gmds/cmake
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/gmds/cmake
 )

Original file line number	Diff line number	Diff line change
`@@ -414,12 +414,11 @@ install(EXPORT GMDS_SUITE`
`414`	`414`	`)`
`415`	`415`
`416`	`416`	`set(INCLUDE_INSTALL_DIR include/)`
`417`		`-set(LIB_INSTALL_DIR lib/)`
`418`	`417`
`419`	`418`	`include(CMakePackageConfigHelpers)`
`420`	`419`	`configure_package_config_file(`
`421`	`420`	`gmdsConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/gmdsConfig.cmake`
`422`		`- INSTALL_DESTINATION ${LIB_INSTALL_DIR}/gmds/cmake`
	`421`	`+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/gmds/cmake`
`423`	`422`	`PATH_VARS INCLUDE_INSTALL_DIR`
`424`	`423`	`)`
`425`	`424`
`@@ -432,5 +431,5 @@ write_basic_package_version_file(`
`432`	`431`	`install(FILES`
`433`	`432`	`${CMAKE_CURRENT_BINARY_DIR}/gmdsConfig.cmake`
`434`	`433`	`# ${CMAKE_CURRENT_BINARY_DIR}/gmdsConfigVersion.cmake`
`435`		`- DESTINATION ${LIB_INSTALL_DIR}/gmds/cmake`
	`434`	`+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/gmds/cmake`
`436`	`435`	`)`