Skip to content
Snippets Groups Projects
Commit 762f10a0 authored by Wolfgang Merkt's avatar Wolfgang Merkt
Browse files

Fix build in catkin environment

parent 3f32b7d4
No related branches found
No related tags found
No related merge requests found
Pipeline #17125 passed
...@@ -7,7 +7,7 @@ SET(CUSTOM_HEADER_DIR "hpp/solo-rbprm") ...@@ -7,7 +7,7 @@ SET(CUSTOM_HEADER_DIR "hpp/solo-rbprm")
SET(CXX_DISABLE_WERROR true) SET(CXX_DISABLE_WERROR true)
SET(PROJECT_USE_CMAKE_EXPORT TRUE) SET(PROJECT_USE_CMAKE_EXPORT TRUE)
INCLUDE(cmake/hpp.cmake) INCLUDE(cmake/base.cmake)
INCLUDE(cmake/python.cmake) INCLUDE(cmake/python.cmake)
COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX) COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
......
<?xml version='1.0'?> <?xml version='1.0'?>
<package format='2'> <package format='3'>
<name>solo-rbprm</name> <name>solo_rbprm</name>
<version>4.12.0</version> <version>4.12.0</version>
<description>Database for Solo robot using hpp-rbprm</description> <description>Database for Solo robot using hpp-rbprm</description>
...@@ -10,5 +10,10 @@ ...@@ -10,5 +10,10 @@
<author>Pierre Fernbach</author> <author>Pierre Fernbach</author>
<author>Steve Tonneau</author> <author>Steve Tonneau</author>
<buildtool_depend>catkin</buildtool_depend> <!-- The following tags are recommended by REP-136 -->
<exec_depend condition="$ROS_VERSION == 1">catkin</exec_depend>
<buildtool_depend>cmake</buildtool_depend>
<export>
<build_type>cmake</build_type>
</export>
</package> </package>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment