revert www changes from last commit

[ros_wild_thumper.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c83bb8648ed0db14f9f0709a677064e57bcc71eb..999926aa31b0646b2ae5fe286142d0ebfa80760e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,11 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(wild_thumper)
+EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE )
 
 ## 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 tf)
 find_package(OpenCV)
 
 ## System dependencies are found with CMake's conventions
@@ -67,9 +68,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
 )
 
 ###################################
@@ -116,6 +120,13 @@ target_link_libraries(path_following
    ${catkin_LIBRARIES}
    ${OpenCV_LIBS}
 )
+if(${ARCHITECTURE} EQUAL "armv7l")
+       add_executable(wt_node src/wt_node.cpp)
+       target_link_libraries(wt_node
+          ${catkin_LIBRARIES}
+          i2c
+       )
+endif()
 
 #############
 ## Install ##