.

src/hos_cosgi_devicerepository/CMakeLists.txt

@@ -8,7 +8,7 @@ find_package(catkin REQUIRED COMPONENTS
   hos_celix
   hos_core_msgs
   hos_cosgi_core
-  hos_libvariant
+  hos_deps
   hos_cpp_utils
   roscpp
 )
@@ -25,6 +25,7 @@ find_package(catkin REQUIRED COMPONENTS
 find_package(APR REQUIRED)
 find_package(CELIX REQUIRED)
 find_package(Boost REQUIRED)
+find_package(libvariant REQUIRED)
 
 
 ################################################
@@ -90,7 +91,7 @@ find_package(Boost REQUIRED)
 catkin_package(
 	INCLUDE_DIRS include/${PROJECT_NAME}/
 #  LIBRARIES hos_cosgi_devicerepository
-	CATKIN_DEPENDS hos_celix hos_core_msgs hos_cosgi_core roscpp hos_libvariant hos_cpp_utils
+	CATKIN_DEPENDS hos_celix hos_core_msgs hos_cosgi_core roscpp hos_deps hos_cpp_utils
 #  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_devicerepository")
@@ -125,6 +126,7 @@ bundle(hos_cosgi_devicerepository
 target_link_libraries(hos_cosgi_devicerepository
 	${catkin_LIBRARIES}
 	${APR_LIBRARIES}
+	${libvariant_LIBRARY}
 )
 
 ## Declare a cpp library