From 51578ad888d0d813134abcc2c99c06a76d429b11 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Sat, 3 May 2014 15:16:44 +0200 Subject: [PATCH 1/2] cmake: Fixed case of variables exported by soem --- soem_beckhoff_drivers/CMakeLists.txt | 4 ++-- soem_master/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/soem_beckhoff_drivers/CMakeLists.txt b/soem_beckhoff_drivers/CMakeLists.txt index e21703f..8203c09 100644 --- a/soem_beckhoff_drivers/CMakeLists.txt +++ b/soem_beckhoff_drivers/CMakeLists.txt @@ -42,7 +42,7 @@ endif() ros_generate_rtt_typekit(soem_beckhoff_drivers) find_package(soem REQUIRED) -include_directories(${soem_INCLUDE_DIRS}) +include_directories(${SOEM_INCLUDE_DIRS}) orocos_use_package(soem_master) @@ -65,4 +65,4 @@ if(NOT ORO_USE_ROSBUILD) add_dependencies(soem_el30xx ${PROJECT_NAME}_generate_messages_cpp) add_dependencies(soem_el3104 ${PROJECT_NAME}_generate_messages_cpp) endif() -orocos_generate_package() \ No newline at end of file +orocos_generate_package() diff --git a/soem_master/CMakeLists.txt b/soem_master/CMakeLists.txt index a2c7158..5b7ae18 100644 --- a/soem_master/CMakeLists.txt +++ b/soem_master/CMakeLists.txt @@ -11,12 +11,12 @@ find_package(OROCOS-RTT REQUIRED ${RTT_HINTS} ) include(${OROCOS-RTT_USE_FILE_PATH}/UseOROCOS-RTT.cmake) find_package(soem REQUIRED) -include_directories(${soem_INCLUDE_DIRS}) +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 ${soem_LIBRARIES}) +target_link_libraries(soem_master soem_driver_factory ${SOEM_LIBRARIES}) orocos_plugin(soem_plugin soem_plugin.cpp) From 24fa09723baa9b81446404d701f1fef0b64f262c Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Sat, 3 May 2014 15:32:36 +0200 Subject: [PATCH 2/2] soem_beckhoff_drivers: link with soem libraries --- soem_beckhoff_drivers/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/soem_beckhoff_drivers/CMakeLists.txt b/soem_beckhoff_drivers/CMakeLists.txt index 8203c09..84c0d7f 100644 --- a/soem_beckhoff_drivers/CMakeLists.txt +++ b/soem_beckhoff_drivers/CMakeLists.txt @@ -47,13 +47,21 @@ include_directories(${SOEM_INCLUDE_DIRS}) orocos_use_package(soem_master) orocos_plugin(soem_el1xxx src/soem_beckhoff_drivers.cpp src/soem_el1xxx.cpp) +target_link_libraries(soem_el1xxx ${SOEM_LIBRARIES}) orocos_plugin(soem_el2xxx src/soem_beckhoff_drivers.cpp src/soem_el2xxx.cpp) +target_link_libraries(soem_el2xxx ${SOEM_LIBRARIES}) orocos_plugin(soem_el4xxx src/soem_beckhoff_drivers.cpp src/soem_el4xxx.cpp) +target_link_libraries(soem_el4xxx ${SOEM_LIBRARIES}) orocos_plugin(soem_el3102 src/soem_beckhoff_drivers.cpp src/soem_el3102.cpp) +target_link_libraries(soem_el3102 ${SOEM_LIBRARIES}) orocos_plugin(soem_el5101 src/soem_beckhoff_drivers.cpp src/soem_el5101.cpp) +target_link_libraries(soem_el5101 ${SOEM_LIBRARIES}) orocos_plugin(soem_el6022 src/soem_beckhoff_drivers.cpp src/soem_el6022.cpp) +target_link_libraries(soem_el6022 ${SOEM_LIBRARIES}) orocos_plugin(soem_el30xx src/soem_beckhoff_drivers.cpp src/soem_el30xx.cpp) +target_link_libraries(soem_el30xx ${SOEM_LIBRARIES}) orocos_plugin(soem_el3104 src/soem_beckhoff_drivers.cpp src/soem_el3104.cpp) +target_link_libraries(soem_el3104 ${SOEM_LIBRARIES}) if(NOT ORO_USE_ROSBUILD) add_dependencies(soem_el1xxx ${PROJECT_NAME}_generate_messages_cpp)