From 6e32df711463eff2c8565fb5ae49a757500eb975 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 29 Jun 2023 18:28:04 -0700 Subject: [PATCH] GzConfigureProject: fix extras install The changes the install location of the extra cmake files to use the CMAKE_INSTALL_LIBDIR variable, so that it matches the installation of the cmake config files. This fixes an issue when building debian packages. Signed-off-by: Steve Peters Signed-off-by: Steve Peters --- cmake/GzConfigureProject.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/GzConfigureProject.cmake b/cmake/GzConfigureProject.cmake index ad9ee32c..249b8d27 100644 --- a/cmake/GzConfigureProject.cmake +++ b/cmake/GzConfigureProject.cmake @@ -162,7 +162,7 @@ macro(gz_configure_project) _gz_string_ends_with("${extra}" ".cmake.in" is_template) if(is_template) get_filename_component(extra_filename "${extra}" NAME) - # cut of .in extension + # cut off .in extension string(LENGTH "${extra_filename}" length) math(EXPR offset "${length} - 3") string(SUBSTRING "${extra_filename}" 0 ${offset} extra_filename) @@ -180,7 +180,7 @@ macro(gz_configure_project) if(is_cmake) install(FILES ${extra} - DESTINATION lib/cmake/${PROJECT_NAME}/ + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/ ) get_filename_component(extra_filename "${extra}" NAME) list(APPEND PACKAGE_CONFIG_EXTRA_FILES "${extra_filename}")