Use relative install paths for plugin shared libraries and gz-tools d…

…ata (#253) Signed-off-by: Addisu Z. Taddese <[email protected]>
gazebosim · Apr 8, 2024 · a3ea50d · a3ea50d
1 parent 955dd77
commit a3ea50d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/plugins/joy_to_twist/CMakeLists.txt b/plugins/joy_to_twist/CMakeLists.txt
@@ -11,4 +11,4 @@ target_link_libraries(${plugin}
     gz-transport${GZ_TRANSPORT_VER}::core
 )
 
-install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_INSTALL_PATH})
+install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_RELATIVE_INSTALL_PATH})
diff --git a/plugins/joystick/CMakeLists.txt b/plugins/joystick/CMakeLists.txt
@@ -11,4 +11,4 @@ target_link_libraries(${plugin}
     gz-plugin${GZ_PLUGIN_VER}::core
 )
 
-install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_INSTALL_PATH})
+install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_RELATIVE_INSTALL_PATH})
diff --git a/plugins/sim_factory/CMakeLists.txt b/plugins/sim_factory/CMakeLists.txt
@@ -13,4 +13,4 @@ target_link_libraries(${plugin_lower}
   gz-plugin${GZ_PLUGIN_VER}::core
 )
 
-install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_INSTALL_PATH})
+install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_RELATIVE_INSTALL_PATH})
diff --git a/plugins/sim_gui/CMakeLists.txt b/plugins/sim_gui/CMakeLists.txt
@@ -16,4 +16,4 @@ target_link_libraries(${plugin_lower}
   gz-plugin${GZ_PLUGIN_VER}::core
 )
 
-install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_INSTALL_PATH})
+install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_RELATIVE_INSTALL_PATH})
diff --git a/plugins/sim_server/CMakeLists.txt b/plugins/sim_server/CMakeLists.txt
@@ -13,4 +13,4 @@ target_link_libraries(${plugin_lower}
   gz-plugin${GZ_PLUGIN_VER}::core
 )
 
-install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_INSTALL_PATH})
+install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_RELATIVE_INSTALL_PATH})
diff --git a/plugins/websocket_server/CMakeLists.txt b/plugins/websocket_server/CMakeLists.txt
@@ -25,5 +25,5 @@ if (websockets_FOUND)
       gz-transport${GZ_TRANSPORT_VER}::core
   )
 
-  install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_INSTALL_PATH})
+  install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_RELATIVE_INSTALL_PATH})
 endif()
diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
@@ -80,7 +80,7 @@ install(
   FILES
     ${CMAKE_CURRENT_BINARY_DIR}/launch${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)
 
 #===============================================================================
 # Generate the ruby script for internal testing.
@@ -151,7 +151,7 @@ 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/)
 
 # Install the ruby command line library in an unversioned location.
 install(FILES ${cmd_script_generated} DESTINATION lib/ruby/gz)