soem: some more patches to make the stack compile with ROS electric

Signed-off-by: Steven Bellens <[email protected]>
MagnaboscoL · Oct 21, 2011 · 37868f8 · 37868f8
1 parent dfb50fe
commit 37868f8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/soem_beckhoff_drivers/CMakeLists.txt b/soem_beckhoff_drivers/CMakeLists.txt
@@ -16,17 +16,15 @@ if (ROS_ROOT)
   include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
   rosbuild_init()
   rosbuild_find_ros_package( rtt )
-  rosbuild_find_ros_package( ocl )
-  set( RTT_HINTS HINTS ${rtt_PACKAGE_PATH}/install )
-  set( OCL_HINTS HINTS ${ocl_PACKAGE_PATH}/install )
+  set( RTT_HINTS HINTS ${rtt_PACKAGE_PATH}/../install )
 endif()
 
 #uncomment if you have defined messages
 rosbuild_genmsg()
 
 # Set the CMAKE_PREFIX_PATH in case you're not using Orocos through
 # ROS for helping these find commands find RTT.
-find_package(OROCOS-RTT HINTS ${rtt_PACKAGE_PATH}/../install )
+find_package(OROCOS-RTT REQUIRED ${RTT_HINTS} )
 
 # Defines the orocos_* cmake macros. See that file for additional
 # documentation.

diff --git a/soem_ebox/CMakeLists.txt b/soem_ebox/CMakeLists.txt
@@ -19,7 +19,7 @@ if (ROS_ROOT)
   include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
   rosbuild_init()
   rosbuild_find_ros_package( rtt )
-  set( RTT_HINTS HINTS ${rtt_PACKAGE_PATH}/install )
+  set( RTT_HINTS HINTS ${rtt_PACKAGE_PATH}/../install )
 endif()
 
 # Set the CMAKE_PREFIX_PATH in case you're not using Orocos through ROS

diff --git a/soem_master/CMakeLists.txt b/soem_master/CMakeLists.txt
@@ -15,11 +15,11 @@ if (ROS_ROOT)
   include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
   rosbuild_init()
   rosbuild_find_ros_package( rtt )
-  set( RTT_HINTS HINTS ${rtt_PACKAGE_PATH}/install )
+  set( RTT_HINTS HINTS ${rtt_PACKAGE_PATH}/../install )
 endif()
 # Set the CMAKE_PREFIX_PATH in case you're not using Orocos through
 # ROS for helping these find commands find RTT.
-find_package(OROCOS-RTT HINTS ${rtt_PACKAGE_PATH}/../install )
+find_package(OROCOS-RTT REQUIRED ${RTT_HINTS} )
 
 # Defines the orocos_* cmake macros. See that file for additional
 # documentation.