Remove RunPythonFile.srv

Update CMakeLists.txt to link with ros_bridge

Author: olivier-stasse

CMakeLists.txt

@@ -160,7 +160,9 @@ IF(BUILD_PYTHON_INTERFACE)
   set_target_properties(ros_interpreter PROPERTIES BUILD_WITH_INSTALL_RPATH True
                         LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
   message(cmakeinstalllibdir " is ${CMAKE_INSTALL_LIBDIR} ")
-  install(TARGETS ros_interpreter DESTINATION lib)
+  install(TARGETS ros_interpreter
+    EXPORT ${TARGETS_EXPORT_NAME}
+    DESTINATION lib)
 
 ENDIF(BUILD_PYTHON_INTERFACE)
 
@@ -176,19 +178,16 @@ add_library(sot_loader src/sot_loader.cpp src/sot_loader_basic.cpp)
 pkg_config_use_dependency(sot_loader dynamic-graph)
 pkg_config_use_dependency(sot_loader sot-core)
 target_link_libraries(sot_loader ${Boost_LIBRARIES} roscpp ros_bridge tf2_ros)
-install(TARGETS sot_loader DESTINATION lib)
+install(TARGETS sot_loader
+  EXPORT ${TARGETS_EXPORT_NAME}
+  DESTINATION lib)
 
 add_subdirectory(src)
 add_subdirectory(tests)
 
-# Deal with the ROS part.
-add_service_files( FILES RunPythonFile.srv )
-generate_messages( DEPENDENCIES std_msgs )
-
-
 # This is necessary so that the pc file generated by catking is similar to the on
 # done directly by jrl-cmake-modules
-catkin_package(CATKIN_DEPENDS message_runtime roscpp realtime_tools ${SOT_PKGNAMES} tf2_ros
+catkin_package(INCLUDE_DIRS include CATKIN_DEPENDS message_runtime roscpp realtime_tools ${SOT_PKGNAMES} tf2_ros
   LIBRARIES ${CATKIN_DEPENDS_LIBRARIES}
 )
 
@@ -206,11 +205,17 @@ IF(BUILD_PYTHON_INTERFACE)
     DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
     )
 
-  # Service file.
-  install(FILES ./srv/RunPythonFile.srv DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/srv)
-
 ENDIF(BUILD_PYTHON_INTERFACE)
 
 message(cmake_install_bindir " is ${CMAKE_INSTALL_BINDIR} ")
-install(TARGETS geometric_simu DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
-install(FILES manifest.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/)
+
+# Install the geometrical simulation node
+install(TARGETS geometric_simu
+  EXPORT ${TARGETS_EXPORT_NAME}
+  DESTINATION
+  ${CATKIN_PACKAGE_SHARE_DESTINATION})
+
+# Install package information
+install(FILES manifest.xml
+  DESTINATION
+  ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/)