From 37868f80e8ead26cf30f57cad9a94629f54b524c Mon Sep 17 00:00:00 2001
From: Steven Bellens <steven.bellens@mech.kuleuven.be>
Date: Fri, 21 Oct 2011 10:23:50 +0200
Subject: [PATCH] soem: some more patches to make the stack compile with ROS
 electric

Signed-off-by: Steven Bellens <steven.bellens@mech.kuleuven.be>
---
 soem_beckhoff_drivers/CMakeLists.txt | 6 ++----
 soem_ebox/CMakeLists.txt             | 2 +-
 soem_master/CMakeLists.txt           | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/soem_beckhoff_drivers/CMakeLists.txt b/soem_beckhoff_drivers/CMakeLists.txt
index 3378b93..d348936 100644
--- a/soem_beckhoff_drivers/CMakeLists.txt
+++ b/soem_beckhoff_drivers/CMakeLists.txt
@@ -16,9 +16,7 @@ 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
@@ -26,7 +24,7 @@ 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
index ca3f811..4694fae 100644
--- 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
index f787294..d5950c0 100644
--- 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.