.

src/hos_cosgi_webserver/CMakeLists.txt

@@ -8,7 +8,6 @@ find_package(catkin REQUIRED COMPONENTS
   hos_cosgi_core
   hos_cpp_utils
   hos_deps
-  cmake_modules
   roscpp
 )
 
@@ -17,7 +16,6 @@ find_package(APR REQUIRED)
 find_package(CELIX REQUIRED)
 find_package(Boost REQUIRED)
 find_package(libvariant REQUIRED)
-find_package(libhttpserver REQUIRED)
 find_package(Poco REQUIRED COMPONENTS Net NetSSL)
 
 
@@ -37,6 +35,8 @@ catkin_package(
 
 add_definitions(
 	-std=c++11
+	# We need to explicitly enable boost nanoseconds
+#	-DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
 )
 
 include_directories(
@@ -45,7 +45,6 @@ include_directories(
 	${APR_INCLUDE_DIR}
 	${APR_INCLUDE_DIR}/apr-1.0
 	${libvariant_INCLUDE_DIRS}
-	${libhttpserver_INCLUDE_DIRS}
 	${Poco_INCLUDE_DIRS}
 )
 
@@ -57,7 +56,7 @@ bundle(hos_cosgi_webserver
 	SOURCES 
 	${PROJECT_SOURCE_DIR}/src/BundleActivator
 	${PROJECT_SOURCE_DIR}/src/hos/cosgi/service/webserver/WebServerServiceImpl
-#	${PROJECT_SOURCE_DIR}/src/hos/cosgi/service/webserver/resources/DevicesHTTPResource
+	${PROJECT_SOURCE_DIR}/src/hos/cosgi/service/webserver/resources/DevicesResource
 	${PROJECT_SOURCE_DIR}/src/hos/cosgi/service/webserver/resources/SchemaResource
 )
 
@@ -65,7 +64,6 @@ target_link_libraries(hos_cosgi_webserver
 	${catkin_LIBRARIES}
 	${APR_LIBRARIES}
 	${libvariant_LIBRARIES}
-	${libhttpserver_LIBRARIES}
 	${Poco_LIBRARIES}
 )