Fix naming of dynamic reconfigure files

[ros_wild_thumper.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9dc330d47f5ea44eb4b1f570dcce68ed660e1c57..be7eeab0689a717392fe886a6360e39f8d736078 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,8 @@ project(wild_thumper)
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
 ## is used, also find other catkin packages
-find_package(catkin REQUIRED sensor_msgs cv_bridge roscpp rospy std_msgs image_transport dynamic_reconfigure message_generation)
+find_package(catkin REQUIRED sensor_msgs cv_bridge roscpp rospy std_msgs image_transport dynamic_reconfigure message_generation rosruby)
+find_package(OpenCV)
 
 ## System dependencies are found with CMake's conventions
 # find_package(Boost REQUIRED COMPONENTS system)
@@ -48,11 +49,10 @@ add_message_files(
 )
 
 ## Generate services in the 'srv' folder
-# add_service_files(
-#   FILES
-#   Service1.srv
-#   Service2.srv
-# )
+add_service_files(
+  FILES
+  DWM1000Center.srv
+)
 
 ## Generate actions in the 'action' folder
 # add_action_files(
@@ -67,9 +67,12 @@ generate_messages(
   std_msgs  # Or other packages containing msgs
 )
 
+rosruby_setup()
+rosruby_generate_messages(fiducial_msgs)
+
 generate_dynamic_reconfigure_options(
-  config/path_following.cfg
-  config/wt_node.cfg
+  config/PathFollowing.cfg
+  config/WildThumper.cfg
 )
 
 ###################################
@@ -97,6 +100,7 @@ catkin_package(
 ## Your package locations should be listed before other locations
 include_directories(
     ${catkin_INCLUDE_DIRS}
+    /opt/ros/tinkerforge/c_bindings/source
 )
 
 ## Declare a cpp library
@@ -114,6 +118,7 @@ add_dependencies(path_following ${PROJECT_NAME}_gencfg)
 ## Specify libraries to link a library or executable target against
 target_link_libraries(path_following
    ${catkin_LIBRARIES}
+   ${OpenCV_LIBS}
 )
 
 #############