1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Fri, 24 Aug 2018 16:57:25 +0200
Subject: Don't generate environment scripts when installing into /usr (not
needed)
---
cmake/all.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/all.cmake b/cmake/all.cmake
index b927a19..2b7d0bb 100644
--- a/cmake/all.cmake
+++ b/cmake/all.cmake
@@ -78,7 +78,7 @@ endif()
# set CATKIN_INSTALL_INTO_PREFIX_ROOT based on CATKIN_BUILD_BINARY_PACKAGE
# if not defined already
if(NOT DEFINED CATKIN_INSTALL_INTO_PREFIX_ROOT)
- if(CATKIN_BUILD_BINARY_PACKAGE)
+ if(CATKIN_BUILD_BINARY_PACKAGE OR CMAKE_INSTALL_PREFIX STREQUAL "/usr")
set(CATKIN_INSTALL_INTO_PREFIX_ROOT FALSE)
else()
set(CATKIN_INSTALL_INTO_PREFIX_ROOT TRUE)
|
