diff --git a/CMakeLists.txt b/CMakeLists.txt index 286dfa46fb3b5bc4f3ed7b83eb590636d4ce38c4..efc913cc5769be562adc57cf39d8b930df3bf1a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.3) -project(ttt_executor) +project(socrates_workshop) ## Compile as C++11, supported in ROS Kinetic and newer # add_compile_options(-std=c++11) @@ -9,12 +9,14 @@ project(ttt_executor) ## is used, also find other catkin packages find_package(catkin REQUIRED COMPONENTS roscpp + rospy std_msgs geometry_msgs sensor_msgs iri_wam_common_msgs iri_common_drivers_msgs actionlib + message_generation ) ## System dependencies are found with CMake's conventions @@ -51,18 +53,19 @@ find_package(catkin REQUIRED COMPONENTS ## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...) ## Generate messages in the 'msg' folder -#add_message_files( +# add_message_files( # FILES # Cell.msg # Message2.msg -#) +# ) ## Generate services in the 'srv' folder -# add_service_files( -# FILES -# SetObjType.srv -# GetCellPose.srv -# ) +add_service_files( + FILES + MiniMax.srv + IntInt.srv + Board.srv +) ## Generate actions in the 'action' folder # add_action_files( @@ -72,12 +75,12 @@ find_package(catkin REQUIRED COMPONENTS # ) ## Generate added messages and services with any dependencies listed here -#generate_messages( -# DEPENDENCIES -# std_msgs +generate_messages( + DEPENDENCIES + std_msgs # sensor_msgs # geometry_msgs -#) +) ################################################ ## Declare ROS dynamic reconfigure parameters ## @@ -109,10 +112,10 @@ find_package(catkin REQUIRED COMPONENTS ## CATKIN_DEPENDS: catkin_packages dependent projects also need ## DEPENDS: system dependencies of this project that dependent projects also need catkin_package( - INCLUDE_DIRS include + # INCLUDE_DIRS include # LIBRARIES ttt_executor - CATKIN_DEPENDS roscpp std_msgs sensor_msgs geometry_msgs iri_wam_common_msgs iri_common_drivers_msgs - DEPENDS system_lib + CATKIN_DEPENDS roscpp rospy std_msgs message_runtime geometry_msgs iri_wam_common_msgs iri_common_drivers_msgs + # DEPENDS system_lib ) ###########