cmake: use find_package for soem

Signed-off-by: Ruben Smits <[email protected]>
MagnaboscoL · May 2, 2014 · ece2551 · ece2551
1 parent 3d6d21f
commit ece2551
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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)