.

2015-05-21 17:50:39 +02:00
parent 19cb6e5cbe
commit d63423aee9
1309 changed files with 329 additions and 481521 deletions
@@ -6,9 +6,13 @@ project(hos_cosgi_scripting)
 ## is used, also find other catkin packages
 find_package(catkin REQUIRED COMPONENTS
  hos_cosgi_core
-  hos_libvariant
+  hos_deps
 )

+
+find_package(libvariant REQUIRED)
+
+
 ## System dependencies are found with CMake's conventions
 # find_package(Boost REQUIRED COMPONENTS system)

@@ -81,7 +85,7 @@ find_package(catkin REQUIRED COMPONENTS
 catkin_package(
  INCLUDE_DIRS include/${PROJECT_NAME}/
 #  LIBRARIES hos_cosgi_scripting
-  CATKIN_DEPENDS hos_cosgi_core hos_libvariant
+  CATKIN_DEPENDS hos_cosgi_core hos_deps
 #  DEPENDS system_lib
 )

@@ -92,9 +96,6 @@ catkin_package(
 ## Specify additional locations of header files
 ## Your package locations should be listed before other locations
 # include_directories(include)
-include_directories(
-  ${catkin_INCLUDE_DIRS}
-)

 ## Declare a cpp library
 # add_library(hos_cosgi_scripting