From ece25512317a5789a1d71d487980a3f3c0cbfb9e Mon Sep 17 00:00:00 2001 From: Ruben Smits Date: Fri, 2 May 2014 17:03:10 +0200 Subject: [PATCH] cmake: use find_package for soem Signed-off-by: Ruben Smits --- soem_beckhoff_drivers/CMakeLists.txt | 4 +++- soem_master/CMakeLists.txt | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/soem_beckhoff_drivers/CMakeLists.txt b/soem_beckhoff_drivers/CMakeLists.txt index 3c3fafc..e21703f 100644 --- a/soem_beckhoff_drivers/CMakeLists.txt +++ b/soem_beckhoff_drivers/CMakeLists.txt @@ -40,9 +40,11 @@ if(ORO_USE_ROSBUILD) endif() ros_generate_rtt_typekit(soem_beckhoff_drivers) + +find_package(soem REQUIRED) +include_directories(${soem_INCLUDE_DIRS}) orocos_use_package(soem_master) -orocos_use_package(soem) orocos_plugin(soem_el1xxx src/soem_beckhoff_drivers.cpp src/soem_el1xxx.cpp) orocos_plugin(soem_el2xxx src/soem_beckhoff_drivers.cpp src/soem_el2xxx.cpp) diff --git a/soem_master/CMakeLists.txt b/soem_master/CMakeLists.txt index 202d3c1..a2c7158 100644 --- a/soem_master/CMakeLists.txt +++ b/soem_master/CMakeLists.txt @@ -10,11 +10,13 @@ find_package(OROCOS-RTT REQUIRED ${RTT_HINTS} ) # documentation. include(${OROCOS-RTT_USE_FILE_PATH}/UseOROCOS-RTT.cmake) -orocos_use_package(soem) +find_package(soem REQUIRED) +include_directories(${soem_INCLUDE_DIRS}) + #common commands for building c++ executables and libraries orocos_library(soem_driver_factory soem_driver_factory.cpp) -orocos_component(soem_master soem_master_component.cpp) -target_link_libraries(soem_master soem_driver_factory) +orocos_component(soem_master soem_master_component.cpp) +target_link_libraries(soem_master soem_driver_factory ${soem_LIBRARIES}) orocos_plugin(soem_plugin soem_plugin.cpp)