.

src/hos_cosgi_webserver/CMakeLists.txt

@@ -9,8 +9,7 @@ find_package(catkin REQUIRED COMPONENTS
   hos_cosgi_devicerepository
   hos_cosgi_core
   hos_cpp_utils
-  hos_libhttpserver
-  hos_libvariant
+  hos_deps
   roscpp
 )
 
@@ -26,6 +25,8 @@ find_package(catkin REQUIRED COMPONENTS
 find_package(APR REQUIRED)
 find_package(CELIX REQUIRED)
 find_package(Boost REQUIRED)
+find_package(libvariant REQUIRED)
+find_package(libhttpserver REQUIRED)
 
 ################################################
 ## Declare ROS messages, services and actions ##
@@ -110,7 +111,8 @@ include_directories(
 	${APR_INCLUDE_DIR}
 	${APR_INCLUDE_DIR}/apr-1.0
 	include/${PROJECT_NAME}/
-	${hos_libvariant_INCLUDE_DIRS}/hos_libvariant
+	${libvariant_INCLUDE_DIR}
+	${libhttpserver_INCLUDE_DIRS}
 )
 
 set(BUNDLE_SYMBOLICNAME "hos.hos_webserver")
@@ -127,6 +129,8 @@ bundle(hos_cosgi_webserver
 target_link_libraries(hos_cosgi_webserver
 	${catkin_LIBRARIES}
 	${APR_LIBRARIES}
+	${libvariant_LIBRARY}
+	${libhttpserver_LIBRARY}
 )