Switch to seperate version of class_loader

envire · Feb 4, 2025 · 1df5330 · 1df5330
1 parent a3c93b6
commit 1df5330
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ option(COVERAGE "Enable code coverage. run 'make test && make coverage' to gener
 
 
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(PLUGIN_LIBS plugin_manager class_loader)
+pkg_check_modules(PLUGIN_LIBS plugin_manager class_loader_melodic)
 if(PLUGIN_LIBS_FOUND)
   #this definition is used in the source to include/exclude the plugin headers
   message(STATUS "Plugin system enabled")

diff --git a/manifest.xml b/manifest.xml
@@ -37,7 +37,7 @@
   <depend package="base/types" />
   <depend package="base/boost_serialization" />
   <depend package="glog" />
-  <depend package="tools/class_loader" optional="1"/>
+  <depend package="tools/class_loader_melodic" optional="1"/>
   <depend package="tools/plugin_manager" optional="1"/>
   <depend package="external/ogdf" />
   <depend package="graphviz" />

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -67,7 +67,7 @@ if(PLUGIN_LIBS_FOUND)
               plugin/Plugin.hpp)
   set(sources ${sources}
               plugin/ClassLoader.cpp)
-  set(deps_pkg_config ${deps_pkg_config} class_loader plugin_manager)
+  set(deps_pkg_config ${deps_pkg_config} class_loader_melodic plugin_manager)
 
 endif()
 

diff --git a/src/plugin/Plugin.hpp b/src/plugin/Plugin.hpp
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <class_loader/class_loader_register_macro.h>
+#include <class_loader_melodic/class_loader_register_macro.h>
 #include <envire_core/items/ItemMetadata.hpp>
 #include <envire_core/items/Item.hpp>
 #include <envire_core/serialization/SerializationRegistration.hpp>

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,18 +1,18 @@
 find_package(Boost COMPONENTS unit_test_framework system filesystem serialization thread)
 
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(PLUGIN_LIBS plugin_manager class_loader)
+pkg_check_modules(PLUGIN_LIBS plugin_manager class_loader_melodic)
 
 if(PLUGIN_LIBS_FOUND)
     rock_library(envire_vector_plugin
         SOURCES vector_plugin.cpp
         DEPS envire_core
-        DEPS_PKGCONFIG class_loader)
+        DEPS_PKGCONFIG class_loader_melodic)
 
     rock_library(envire_string_plugin
         SOURCES string_plugin.cpp
         DEPS envire_core
-        DEPS_PKGCONFIG class_loader)
+        DEPS_PKGCONFIG class_loader_melodic)
 
     # The plugin test suit cannot use the rock test macros because it needs to set
     # the library path before executing the test
@@ -24,12 +24,12 @@ if(PLUGIN_LIBS_FOUND)
         PathSingleton.cpp
         test_serialization.cpp)
 
-    pkg_check_modules(CLS_LOADER REQUIRED class_loader)
+    pkg_check_modules(CLS_LOADER REQUIRED class_loader_melodic)
 
     target_link_libraries(test_plugins 
                           envire_core
                           ${Boost_LIBRARIES}
-                          ${class_loader_PKGCONFIG_LIBRARIES})
+                          ${class_loader_melodic_PKGCONFIG_LIBRARIES})
 
     add_test(NAME test-plugins-cxx
              COMMAND "${CMAKE_CURRENT_BINARY_DIR}/test_plugins")
@@ -59,7 +59,7 @@ rock_testsuite(test_suite suite.cpp
     test_item_changed_callback.cpp
     test_graph_event_dispatcher.cpp
     PathSingleton.cpp
-    DEPS_PKGCONFIG class_loader plugin_manager
+    DEPS_PKGCONFIG plugin_manager 
     DEPS 
       envire_core
     DEPS_PLAIN