From 1bc78ac23e465c1b3ef040d11c53d89cdc00b8ae Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Fri, 26 Jul 2013 13:34:18 -0700 Subject: [PATCH] resolve genpy path in installspace at runtime (ros/catkin#490) --- cmake/genpy-extras.cmake.em | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/genpy-extras.cmake.em b/cmake/genpy-extras.cmake.em index fd78a97..5a57285 100644 --- 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)