.
This commit is contained in:
@@ -10,7 +10,7 @@ find_package(catkin REQUIRED COMPONENTS
|
||||
hos_cosgi_scripting
|
||||
hos_cosgi_devicerepository
|
||||
hos_cpp_utils
|
||||
hos_libvariant
|
||||
hos_deps
|
||||
)
|
||||
|
||||
## System dependencies are found with CMake's conventions
|
||||
@@ -25,6 +25,7 @@ find_package(catkin REQUIRED COMPONENTS
|
||||
find_package(APR REQUIRED)
|
||||
find_package(CELIX REQUIRED)
|
||||
find_package(Boost REQUIRED COMPONENTS python)
|
||||
find_package(libvariant REQUIRED)
|
||||
|
||||
|
||||
################################################
|
||||
@@ -90,7 +91,7 @@ find_package(Boost REQUIRED COMPONENTS python)
|
||||
catkin_package(
|
||||
# INCLUDE_DIRS include
|
||||
# LIBRARIES hos_cosgi_ruleexecution_python
|
||||
CATKIN_DEPENDS hos_celix hos_cosgi_core hos_cosgi_scripting hos_cpp_utils hos_libvariant hos_cosgi_devicerepository
|
||||
CATKIN_DEPENDS hos_celix hos_cosgi_core hos_cosgi_scripting hos_cpp_utils hos_deps hos_cosgi_devicerepository
|
||||
# DEPENDS system_lib
|
||||
)
|
||||
|
||||
@@ -110,7 +111,7 @@ include_directories(
|
||||
${APR_INCLUDE_DIR}
|
||||
${APR_INCLUDE_DIR}/apr-1.0
|
||||
include
|
||||
${hos_libvariant_INCLUDE_DIRS}/hos_libvariant
|
||||
${libvariant_INCLUDE_DIR}
|
||||
/usr/include/python2.7
|
||||
)
|
||||
|
||||
@@ -128,6 +129,7 @@ target_link_libraries(hos_cosgi_scripting_python
|
||||
${catkin_LIBRARIES}
|
||||
${APR_LIBRARIES}
|
||||
${Boost_LIBRARIES}
|
||||
${libvariant_LIBRARY}
|
||||
python2.7
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user