fix installation of __init__.py file for packages where name differs …

…from project name (#34)
ros · Sep 13, 2013 · 6bbac53 · 6bbac53
1 parent 752140a
commit 6bbac53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cmake/genmsg-extras.cmake.em b/cmake/genmsg-extras.cmake.em
@@ -282,8 +282,9 @@ macro(generate_messages)
 
   # mark that generate_messages() was called in order to detect wrong order of calling with catkin_python_setup()
   set(${PROJECT_NAME}_GENERATE_MESSAGES TRUE)
-  # check if catkin_python_setup() was called in order to skip installation of generated __init__.py file
-  set(package_has_static_sources ${${PROJECT_NAME}_CATKIN_PYTHON_SETUP})
+  # check if catkin_python_setup() installs an __init__.py file for a package with the current project name
+  # in order to skip the installation of a generated __init__.py file
+  set(package_has_static_sources ${${PROJECT_NAME}_CATKIN_PYTHON_SETUP_HAS_PACKAGE_INIT})
 
   em_expand(${genmsg_CMAKE_DIR}/pkg-genmsg.context.in
     ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}-genmsg-context.py

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