.

src/hos_cosgi_ruleengine/CMakeLists.txt

@@ -10,7 +10,7 @@ find_package(catkin REQUIRED COMPONENTS
   hos_cosgi_core
   hos_cosgi_scripting
   hos_cpp_utils
-  hos_libvariant
+  hos_deps
   roscpp
   hos_cpp_cron
 )
@@ -27,6 +27,7 @@ find_package(catkin REQUIRED COMPONENTS
 find_package(APR REQUIRED)
 find_package(CELIX REQUIRED)
 find_package(Boost REQUIRED)
+find_package(libvariant REQUIRED)
 
 ################################################
 ## Declare ROS messages, services and actions ##
@@ -90,7 +91,7 @@ find_package(Boost REQUIRED)
 catkin_package(
   INCLUDE_DIRS include/${PROJECT_NAME}/
 #  LIBRARIES hos_cosgi_ruleengine
-  CATKIN_DEPENDS hos_celix hos_cosgi_devicerepository hos_cosgi_core hos_cpp_utils hos_libvariant roscpp hos_cpp_cron hos_cosgi_scripting
+  CATKIN_DEPENDS hos_celix hos_cosgi_devicerepository hos_cosgi_core hos_cpp_utils hos_deps roscpp hos_cpp_cron hos_cosgi_scripting
 #  DEPENDS system_lib
 )
 
@@ -110,7 +111,7 @@ include_directories(
 	${APR_INCLUDE_DIR}
 	${APR_INCLUDE_DIR}/apr-1.0
 	include/${PROJECT_NAME}/
-	${hos_libvariant_INCLUDE_DIRS}/hos_libvariant
+	${libvariant_INCLUDE_DIR}
 )
 
 set(BUNDLE_SYMBOLICNAME "hos.hos_ruleengine")
@@ -128,6 +129,7 @@ bundle(hos_cosgi_ruleengine
 target_link_libraries(hos_cosgi_ruleengine
 	${catkin_LIBRARIES}
 	${APR_LIBRARIES}
+	${libvariant_LIBRARY}
 )
 
 ## Declare a cpp library