Fixes for building on Ubuntu Noble (#1016)

tesseract-robotics · Dec 23, 2024 · 724e5f1 · 724e5f1
1 parent a2750a9
commit 724e5f1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/tesseract_common/test/plugin_loader_unit.cpp b/tesseract_common/test/plugin_loader_unit.cpp
@@ -82,8 +82,8 @@ TEST(TesseractClassLoaderUnit, LoadTestPlugin)  // NOLINT
 // For some reason on Ubuntu 18.04 it does not search the current directory when only the library name is provided
 #if BOOST_VERSION > 106800 && !__APPLE__
   {
-    EXPECT_TRUE(ClassLoader::isClassAvailable(symbol_name, lib_name));
-    auto plugin = ClassLoader::createSharedInstance<TestPluginBase>(symbol_name, lib_name);
+    EXPECT_TRUE(ClassLoader::isClassAvailable(symbol_name, lib_name, "."));
+    auto plugin = ClassLoader::createSharedInstance<TestPluginBase>(symbol_name, lib_name, ".");
     EXPECT_TRUE(plugin != nullptr);
     EXPECT_NEAR(plugin->multiply(5, 5), 25, 1e-8);
   }
@@ -150,6 +150,7 @@ TEST(TesseractPluginLoaderUnit, LoadTestPlugin)  // NOLINT
 #if BOOST_VERSION > 106800 && !__APPLE__
   {
     PluginLoader plugin_loader;
+    plugin_loader.search_paths.insert(".");
     plugin_loader.search_libraries.insert("tesseract_common_test_plugin_multiply");
 
     EXPECT_TRUE(plugin_loader.isPluginAvailable("plugin"));

diff --git a/tesseract_environment/CMakeLists.txt b/tesseract_environment/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15.0)
 # Extract package name and version
 find_package(ros_industrial_cmake_boilerplate REQUIRED)
 extract_package_metadata(pkg)
-project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES C CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)

diff --git a/tesseract_kinematics/CMakeLists.txt b/tesseract_kinematics/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15.0)
 # Extract package name and version
 find_package(ros_industrial_cmake_boilerplate REQUIRED)
 extract_package_metadata(pkg)
-project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES C CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)

diff --git a/tesseract_state_solver/CMakeLists.txt b/tesseract_state_solver/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15.0)
 # Extract package name and version
 find_package(ros_industrial_cmake_boilerplate REQUIRED)
 extract_package_metadata(pkg)
-project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES C CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)

diff --git a/tesseract_urdf/CMakeLists.txt b/tesseract_urdf/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15.0)
 # Extract package name and version
 find_package(ros_industrial_cmake_boilerplate REQUIRED)
 extract_package_metadata(pkg)
-project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES C CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -12,7 +12,7 @@ endif()
 find_package(Boost REQUIRED)
 find_package(Eigen3 REQUIRED)
 find_package(console_bridge REQUIRED)
-find_package(PCL REQUIRED COMPONENTS common io)
+find_package(PCL REQUIRED COMPONENTS io)
 find_package(tesseract_geometry REQUIRED)
 find_package(tesseract_common REQUIRED)
 find_package(tesseract_scene_graph REQUIRED)

diff --git a/tesseract_visualization/CMakeLists.txt b/tesseract_visualization/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15.0)
 # Extract package name and version
 find_package(ros_industrial_cmake_boilerplate REQUIRED)
 extract_package_metadata(pkg)
-project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES C CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)