Codebase list ros-genmsg / a7f9613
Add special handling for Debian /usr workspace Timo Röhling 2 years ago
2 changed file(s) with 36 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
+35
-0
debian/patches/0005-Special-handling-for-Debian-usr-workspace.patch less more
0 From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
1 Date: Tue, 21 Sep 2021 22:18:08 +0200
2 Subject: Special handling for Debian /usr workspace
3
4 ---
5 cmake/genmsg-extras.cmake.em | 5 +++++
6 cmake/pkg-msg-paths.cmake.installspace.in | 2 +-
7 2 files changed, 6 insertions(+), 1 deletion(-)
8
9 diff --git a/cmake/genmsg-extras.cmake.em b/cmake/genmsg-extras.cmake.em
10 index 85a54bd..7a30f4e 100644
11 --- a/cmake/genmsg-extras.cmake.em
12 +++ b/cmake/genmsg-extras.cmake.em
13 @@ -231,6 +231,11 @@ macro(generate_messages)
14 @@ONLY)
15 # generate and install config of message include dirs for project
16 set(PKG_MSG_INCLUDE_DIRS "${${PROJECT_NAME}_MSG_INCLUDE_DIRS_INSTALLSPACE}")
17 + if(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
18 + set(PACKAGE_INSTALL_SHARE_LOCATION "${CMAKE_INSTALL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}")
19 + else()
20 + set(PACKAGE_INSTALL_SHARE_LOCATION "\${${PROJECT_NAME}_DIR}/..")
21 + endif()
22 configure_file(
23 ${genmsg_CMAKE_DIR}/pkg-msg-paths.cmake.installspace.in
24 ${CMAKE_CURRENT_BINARY_DIR}/catkin_generated/installspace/${PROJECT_NAME}-msg-paths.cmake
25 diff --git a/cmake/pkg-msg-paths.cmake.installspace.in b/cmake/pkg-msg-paths.cmake.installspace.in
26 index 1d35efd..69a3789 100644
27 --- a/cmake/pkg-msg-paths.cmake.installspace.in
28 +++ b/cmake/pkg-msg-paths.cmake.installspace.in
29 @@ -1,4 +1,4 @@
30 # generated from genmsg/cmake/pkg-msg-paths.cmake.installspace.in
31
32 -_prepend_path("${@PROJECT_NAME@_DIR}/.." "@PKG_MSG_INCLUDE_DIRS@" @PROJECT_NAME@_MSG_INCLUDE_DIRS UNIQUE)
33 +_prepend_path("@PACKAGE_INSTALL_SHARE_LOCATION@" "@PKG_MSG_INCLUDE_DIRS@" @PROJECT_NAME@_MSG_INCLUDE_DIRS UNIQUE)
34 set(@PROJECT_NAME@_MSG_DEPENDENCIES @ARG_DEPENDENCIES@)
+1
-0
debian/patches/series less more
11 0002-Search-in-for-message-generators.patch
22 0003-Fix-location-of-genmsg_check_deps.py.patch
33 0004-Switch-genmsg_check_deps.py-to-Python-3.patch
4 0005-Special-handling-for-Debian-usr-workspace.patch