Use relative install paths for gz tool data and extra cmake files (#436)

Signed-off-by: Addisu Z. Taddese <[email protected]>
gazebosim · Apr 8, 2024 · 5d0a0a2 · 5d0a0a2
1 parent 1f080a4
commit 5d0a0a2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -175,7 +175,7 @@ file(
 # Install cmake support files
 install(
   DIRECTORY cmake/
-  DESTINATION "${PROJECT_CMAKE_EXTRAS_INSTALL_DIR}"
+  DESTINATION "${PROJECT_CMAKE_EXTRAS_RELATIVE_INSTALL_DIR}"
 )
 
 #============================================================================

diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
@@ -24,4 +24,4 @@ configure_file(
 
 # Install the yaml configuration files in an unversioned location.
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/gz/)
+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/gz/)
diff --git a/core/src/cmd/CMakeLists.txt b/core/src/cmd/CMakeLists.txt
@@ -57,4 +57,4 @@ install(
   FILES
     ${CMAKE_CURRENT_BINARY_DIR}/msgs${PROJECT_VERSION_MAJOR}.bash_completion.sh
   DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/gz/gz${GZ_TOOLS_VER}.completion.d)
+    ${CMAKE_INSTALL_DATAROOTDIR}/gz/gz${GZ_TOOLS_VER}.completion.d)