Merge pull request #61 from ros/find_package_catkin

find_package(catkin)
ros · Feb 23, 2016 · 4f969dc · 4f969dc
2 parents 47fdb81 + e54d7e3
commit 4f969dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/cmake/genmsg-extras.cmake.em b/cmake/genmsg-extras.cmake.em
@@ -8,6 +8,9 @@ set(_GENMSG_EXTRAS_INCLUDED_ TRUE)
 # set destination for langs
 set(GENMSG_LANGS_DESTINATION "etc/ros/genmsg")
 
+# We need various macros and variables that are provided by catkin
+find_package(catkin REQUIRED)
+
 @[if DEVELSPACE]@
 # bin dir variables in develspace
 set(GENMSG_CHECK_DEPS_SCRIPT "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/genmsg_check_deps.py")

diff --git a/package.xml b/package.xml
@@ -17,6 +17,7 @@
   <author>Ken Conley</author>
 
   <buildtool_depend version_gte="0.5.74">catkin</buildtool_depend>
+  <run_depend>catkin</run_depend>
 
   <export>
     <rosdoc config="rosdoc.yaml"/>