Remove RunPythonFile.srv

Update CMakeLists.txt to link with ros_bridge

Author: olivier-stasse

CMakeLists.txt

@@ -119,11 +119,8 @@ SET(SOT_PKGNAMES
 dynamic_graph_bridge_msgs)
 
 #add_project_dependency(realtime_tools 1.8 REQUIRED)
-
-
 ADD_PROJECT_DEPENDENCY(dynamic-graph  3.0.0 REQUIRED)
 ADD_PROJECT_DEPENDENCY(sot-core REQUIRED)
-
 ADD_PROJECT_dependency(dynamic_graph_bridge_msgs)
 
 foreach(sot_pkgname ${SOT_PKGNAMES})
@@ -244,7 +241,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)
 
@@ -260,18 +259,17 @@ target_link_libraries(geometric_simu ${CATKIN_DEPENDS_LIBRARIES})
 
 # Sot loader library
 add_library(sot_loader src/sot_loader.cpp src/sot_loader_basic.cpp)
+target_link_libraries(sot_loader ros_bridge)
 target_link_libraries(sot_loader dynamic-graph::dynamic-graph)
 target_link_libraries(sot_loader sot-core::sot-core)
 target_link_libraries(sot_loader ${Boost_LIBRARIES} )
-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(INCLUDE_DIRS include
@@ -295,11 +293,6 @@ 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} ")
@@ -315,5 +308,9 @@ install(FILES manifest.xml
   DESTINATION
   ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/)
 
+foreach(catkin_loc_package ${CATKIN_REQUIRED_COMPONENTS})
+  list(APPEND _PACKAGE_CONFIG_DEPENDENCIES
+    "find_package(${catkin_loc_package})")
+endforeach(catkin_loc_package)
 
 SETUP_PROJECT_PACKAGE_FINALIZE()