Merge branch 'cmake-export' into 'devel'

Cmake export

See merge request pyrene-dev/talos_data!10

CMakeLists.txt

@@ -5,40 +5,46 @@ SET(PROJECT_NAME talos_data)
 SET(PROJECT_DESCRIPTION "Talos urdf model, srdf model and other data")
 SET(PROJECT_URL "https://gepgitlab.laas.fr/${PROJECT_ORG}/${PROJECT_NAME}")
 
+SET(PROJECT_USE_CMAKE_EXPORT TRUE)
+SET(CXX_DISABLE_WERROR True)
+SET(CMAKE_CXX_STANDARD 11)
+
 #include(cmake/ros.cmake)
 INCLUDE(cmake/base.cmake)
 
-set(CXX_DISABLE_WERROR True)
-
+# Specify the project.
 COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
 PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
 
-find_package(catkin REQUIRED)
+find_package(catkin REQUIRED COMPONENTS
+  roscpp)
 
 catkin_package(
   #  INCLUDE_DIRS include
   #  LIBRARIES talos_description
-  #  CATKIN_DEPENDS other_catkin_pkg
+  #  CATKIN_DEPENDS roscpp
   #  DEPENDS system_lib
   )
 
 # Find xml_reflection
-ADD_REQUIRED_DEPENDENCY("urdfdom >= 0.2.9")
-ADD_REQUIRED_DEPENDENCY("gazebo >= 7.0.0")
+ADD_PROJECT_DEPENDENCY(urdfdom REQUIRED)
+ADD_PROJECT_DEPENDENCY(gazebo REQUIRED)
 ADD_COMPILE_DEPENDENCY(roscpp)
 
-ADD_LIBRARY(SpringPlugin
+ADD_LIBRARY(${PROJECT_NAME}
   SHARED
   src/SpringPlugin.cc
   )
 
+TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PRIVATE ${GAZEBO_INCLUDE_DIRS})
+TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PRIVATE ${catkin_INCLUDE_DIRS})
+
 INSTALL(TARGETS
-  SpringPlugin
+  ${PROJECT_NAME}
+  EXPORT ${TARGETS_EXPORT_NAME}
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   )
-PKG_CONFIG_USE_DEPENDENCY(SpringPlugin roscpp)
-PKG_CONFIG_USE_DEPENDENCY(SpringPlugin gazebo)
 
 FOREACH(dir config gazebo meshes robots urdf srdf launch)
   INSTALL(DIRECTORY ${dir}/

cmake @ 54ece258

-Subproject commit f5e018896d0b1746a03f07ba02a5199e17eaee67
+Subproject commit 54ece258eed16da94c7f10979588fcb47b744eb8

package.xml

@@ -10,6 +10,8 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
+  <build_depend>roscpp</build_depend>
+
   <exec_depend>talos_description_calibration</exec_depend>
   <exec_depend>talos_description_inertial</exec_depend>