1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sun, 28 Aug 2016 14:06:53 +0200
Subject: Don't export development path to release package
---
cmake/catkin_package.cmake | 8 ++++++++
cmake/templates/pkgConfig.cmake.in | 15 ++++-----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/cmake/catkin_package.cmake b/cmake/catkin_package.cmake
index bde58d8..e69c1ca 100644
--- a/cmake/catkin_package.cmake
+++ b/cmake/catkin_package.cmake
@@ -282,6 +282,10 @@ function(_catkin_package)
# used in the cmake extra files
set(DEVELSPACE TRUE)
set(INSTALLSPACE FALSE)
+ set(PROJECT_NAME_SOURCE_PREFIX ${CMAKE_CURRENT_SOURCE_DIR})
+ set(PROJECT_NAME_DEVEL_PREFIX ${CATKIN_DEVEL_PREFIX})
+ set(PROJECT_NAME_INSTALL_PREFIX "")
+ set(PROJECT_NAME_PREFIX DEVEL)
set(PROJECT_SPACE_DIR ${CATKIN_DEVEL_PREFIX})
set(PKG_INCLUDE_PREFIX ${CMAKE_CURRENT_SOURCE_DIR})
@@ -396,6 +400,10 @@ function(_catkin_package)
# used in the cmake extra files
set(DEVELSPACE FALSE)
set(INSTALLSPACE TRUE)
+ set(PROJECT_NAME_SOURCE_PREFIX "")
+ set(PROJECT_NAME_DEVEL_PREFIX "")
+ set(PROJECT_NAME_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set(PROJECT_NAME_PREFIX INSTALL)
set(PROJECT_SPACE_DIR ${CMAKE_INSTALL_PREFIX})
set(PKG_INCLUDE_PREFIX ${PROJECT_SPACE_DIR})
diff --git a/cmake/templates/pkgConfig.cmake.in b/cmake/templates/pkgConfig.cmake.in
index 4677100..7696edc 100644
--- a/cmake/templates/pkgConfig.cmake.in
+++ b/cmake/templates/pkgConfig.cmake.in
@@ -66,17 +66,10 @@ endif()
set(@PROJECT_NAME@_CONFIG_INCLUDED TRUE)
# set variables for source/devel/install prefixes
-if("@DEVELSPACE@" STREQUAL "TRUE")
- set(@PROJECT_NAME@_SOURCE_PREFIX @CMAKE_CURRENT_SOURCE_DIR@)
- set(@PROJECT_NAME@_DEVEL_PREFIX @CATKIN_DEVEL_PREFIX@)
- set(@PROJECT_NAME@_INSTALL_PREFIX "")
- set(@PROJECT_NAME@_PREFIX ${@PROJECT_NAME@_DEVEL_PREFIX})
-else()
- set(@PROJECT_NAME@_SOURCE_PREFIX "")
- set(@PROJECT_NAME@_DEVEL_PREFIX "")
- set(@PROJECT_NAME@_INSTALL_PREFIX @CMAKE_INSTALL_PREFIX@)
- set(@PROJECT_NAME@_PREFIX ${@PROJECT_NAME@_INSTALL_PREFIX})
-endif()
+set(@PROJECT_NAME@_SOURCE_PREFIX @PROJECT_NAME_SOURCE_PREFIX@)
+set(@PROJECT_NAME@_DEVEL_PREFIX @PROJECT_NAME_DEVEL_PREFIX@)
+set(@PROJECT_NAME@_INSTALL_PREFIX @PROJECT_NAME_INSTALL_PREFIX@)
+set(@PROJECT_NAME@_PREFIX ${@PROJECT_NAME@_@PROJECT_NAME_PREFIX@_PREFIX})
# warn when using a deprecated package
if(NOT "@PROJECT_DEPRECATED@" STREQUAL "")
|
