Merge pull request #16 from ros/relocatable

resolve genpy path in installspace at runtime (ros/catkin#490)
ros · Aug 3, 2013 · ad8b067 · ad8b067
2 parents fe769d9 + 1bc78ac
commit ad8b067
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cmake/genpy-extras.cmake.em b/cmake/genpy-extras.cmake.em
@@ -1,9 +1,9 @@
 @[if DEVELSPACE]@
-# bin dir variables in develspace
+# location of scripts in develspace
 set(GENPY_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
 @[else]@
-# bin dir variables in installspace
-set(GENPY_BIN_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)")
+# location of scripts in installspace
+set(GENPY_BIN_DIR "${genpy_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)")
 @[end if]@
 
 set(GENMSG_PY_BIN ${GENPY_BIN_DIR}/genmsg_py.py)