Update so binaries are installed in lib so rosrun will find them

tesseract-robotics · Dec 3, 2024 · 0aaf881 · 0aaf881
1 parent 6ae2234
commit 0aaf881
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/dependencies.rosinstall b/dependencies.rosinstall
@@ -1,11 +1,11 @@
 - git:
     local-name: ros_industrial_cmake_boilerplate
     uri: https://github.com/ros-industrial/ros_industrial_cmake_boilerplate.git
-    version: 0.6.2
+    version: 0.6.3
 - git:
     local-name: tesseract
     uri: https://github.com/tesseract-robotics/tesseract.git
-    version: 0.27.0
+    version: 0.27.1
 - git:
     local-name: trajopt
     uri: https://github.com/tesseract-robotics/trajopt.git

diff --git a/dependencies_with_ext.rosinstall b/dependencies_with_ext.rosinstall
@@ -1,15 +1,15 @@
 - git:
     local-name: ros_industrial_cmake_boilerplate
     uri: https://github.com/ros-industrial/ros_industrial_cmake_boilerplate.git
-    version: 0.6.2
+    version: 0.6.3
 - git:
     local-name: tesseract_ext
     uri: https://github.com/tesseract-robotics/tesseract_ext.git
     version: master
 - git:
     local-name: tesseract
     uri: https://github.com/tesseract-robotics/tesseract.git
-    version: 0.27.0
+    version: 0.27.1
 - git:
     local-name: trajopt
     uri: https://github.com/tesseract-robotics/trajopt_ros.git

diff --git a/tesseract_monitoring/CMakeLists.txt b/tesseract_monitoring/CMakeLists.txt
@@ -78,6 +78,10 @@ catkin_package(
   SKIP_PKG_CONFIG_GENERATION
 )
 
+# Override the default installation directory for executables
+set(CMAKE_INSTALL_BINDIR ${CATKIN_PACKAGE_BIN_DESTINATION})
+set(CMAKE_INSTALL_LIBDIR ${CATKIN_PACKAGE_LIB_DESTINATION})
+
 configure_package(
   NAMESPACE tesseract
   TARGETS

diff --git a/tesseract_planning_server/CMakeLists.txt b/tesseract_planning_server/CMakeLists.txt
@@ -91,6 +91,10 @@ catkin_package(
   SKIP_PKG_CONFIG_GENERATION
 )
 
+# Override the default installation directory for executables
+set(CMAKE_INSTALL_BINDIR ${CATKIN_PACKAGE_BIN_DESTINATION})
+set(CMAKE_INSTALL_LIBDIR ${CATKIN_PACKAGE_LIB_DESTINATION})
+
 # Configure Package
 configure_package(
   NAMESPACE tesseract

diff --git a/tesseract_qt_ros/CMakeLists.txt b/tesseract_qt_ros/CMakeLists.txt
@@ -95,6 +95,10 @@ catkin_package(
   SKIP_PKG_CONFIG_GENERATION
 )
 
+# Override the default installation directory for executables
+set(CMAKE_INSTALL_BINDIR ${CATKIN_PACKAGE_BIN_DESTINATION})
+set(CMAKE_INSTALL_LIBDIR ${CATKIN_PACKAGE_LIB_DESTINATION})
+
 # Configure Package
 configure_package(
   NAMESPACE tesseract