.

2015-05-09 17:13:01 +02:00
parent 9c132de686
commit 4e2fe033c9
145 changed files with 7213 additions and 1252 deletions
@@ -89,7 +89,7 @@ find_package(Boost REQUIRED)
 ## CATKIN_DEPENDS: catkin_packages dependent projects also need
 ## DEPENDS: system dependencies of this project that dependent projects also need
 catkin_package(
-	INCLUDE_DIRS include
+	INCLUDE_DIRS include/${PROJECT_NAME}/
 #  LIBRARIES hos_cosgi_devicerepository
 	CATKIN_DEPENDS hos_celix hos_core_msgs hos_cosgi_launcher roscpp hos_cosgi_common hos_libvariant hos_cpp_common
 #  DEPENDS system_lib
@@ -110,7 +110,7 @@ include_directories(
 	${catkin_INCLUDE_DIRS}
 	${APR_INCLUDE_DIR}
 	${APR_INCLUDE_DIR}/apr-1.0
-	include
+	include/${PROJECT_NAME}/
 	${hos_libvariant_INCLUDE_DIRS}/hos_libvariant
 )

@@ -121,7 +121,7 @@ set(BUNDLE_NAME "hos_devicerepository")
 bundle(hos_cosgi_devicerepository
 	SOURCES 
 	${PROJECT_SOURCE_DIR}/src/bundle_activator
-	${PROJECT_SOURCE_DIR}/src/hos_devicerepository_service_impl
+	${PROJECT_SOURCE_DIR}/src/hos/cosgi/service/devicerepository/devicerepository_serviceimpl
 )
 target_link_libraries(hos_cosgi_devicerepository
 	${catkin_LIBRARIES}