Codebase list ros-rosconsole-bridge / 3511bf1
Add patch for catkin install dirs Jochen Sprickerhof 8 years ago
3 changed file(s) with 31 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all
+1
-1
debian/patches/0001-Add-Debian-specific-SOVERSION.patch less more
66 1 file changed, 1 insertion(+)
77
88 diff --git a/CMakeLists.txt b/CMakeLists.txt
9 index 7572c65..de414dc 100644
9 index 7572c65..6f3d12a 100644
1010 --- a/CMakeLists.txt
1111 +++ b/CMakeLists.txt
1212 @@ -17,6 +17,7 @@ catkin_package(
+29
-0
debian/patches/0002-Use-catkin-variables-for-install-dirs.patch less more
0 From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
1 Date: Mon, 23 Nov 2015 14:35:05 +0100
2 Subject: Use catkin variables for install dirs
3
4 ---
5 CMakeLists.txt | 10 ++++------
6 1 file changed, 4 insertions(+), 6 deletions(-)
7
8 diff --git a/CMakeLists.txt b/CMakeLists.txt
9 index 6f3d12a..5add1dc 100644
10 --- a/CMakeLists.txt
11 +++ b/CMakeLists.txt
12 @@ -21,12 +21,10 @@ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${rosconsole_bridge_VER
13
14 install(
15 TARGETS ${PROJECT_NAME}
16 - ARCHIVE DESTINATION lib
17 - LIBRARY DESTINATION lib
18 + ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
19 + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
20 )
21
22 install(
23 - DIRECTORY include/
24 - DESTINATION include
25 - FILES_MATCHING PATTERN "*.h"
26 -)
27 + DIRECTORY include/${PROJECT_NAME}/
28 + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
+1
-0
debian/patches/series less more
00 0001-Add-Debian-specific-SOVERSION.patch
1 0002-Use-catkin-variables-for-install-dirs.patch