.

2015-04-27 00:54:16 +02:00
parent 5d650f14c4
commit 782c00e296
108 changed files with 1826 additions and 348 deletions
@@ -10,6 +10,7 @@ find_package(catkin REQUIRED COMPONENTS
  hos_cosgi_launcher
  hos_cosgi_core
  hos_libvariant
+  hos_cpp_common
  roscpp
 )

@@ -90,7 +91,7 @@ find_package(Boost REQUIRED)
 catkin_package(
 	INCLUDE_DIRS include
 #  LIBRARIES hos_cosgi_devicerepository
-	CATKIN_DEPENDS hos_celix hos_core_msgs hos_cosgi_launcher roscpp hos_cosgi_core hos_libvariant
+	CATKIN_DEPENDS hos_celix hos_core_msgs hos_cosgi_launcher roscpp hos_cosgi_core hos_libvariant hos_cpp_common
 #  DEPENDS system_lib
 )

@@ -110,10 +111,10 @@ include_directories(
 	${APR_INCLUDE_DIR}
 	${APR_INCLUDE_DIR}/apr-1.0
 	include
+	${hos_libvariant_INCLUDE_DIRS}/hos_libvariant
 )

-
-set(BUNDLE_SYMBOLICNAME "com.hos.hos_devicerepository")
+set(BUNDLE_SYMBOLICNAME "hos.hos_devicerepository")
 set(BUNDLE_VERSION "1.0.0")
 set(BUNDLE_NAME "hos_devicerepository")

@@ -121,6 +122,7 @@ bundle(hos_cosgi_devicerepository
 	SOURCES 
 	${PROJECT_SOURCE_DIR}/src/bundle_activator
 	${PROJECT_SOURCE_DIR}/src/hos_devicerepository_service_impl
+	${PROJECT_SOURCE_DIR}/src/HosSchemaLoader
 )
 target_link_libraries(hos_cosgi_devicerepository
 	${catkin_LIBRARIES}