File: 0011-Use-CMAKE_INSTALL_PREFIX-for-rostest-path.patch

package info (click to toggle)
ros-ros-comm 1.17.4%2Bds-3
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 10,400 kB
  • sloc: cpp: 42,116; python: 38,991; xml: 2,665; ansic: 2,384; sh: 274; makefile: 30
file content (21 lines) | stat: -rw-r--r-- 957 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Fri, 24 Sep 2021 08:39:22 +0200
Subject: Use CMAKE_INSTALL_PREFIX for rostest path

---
 tools/rostest/cmake/rostest-extras.cmake.em | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/rostest/cmake/rostest-extras.cmake.em b/tools/rostest/cmake/rostest-extras.cmake.em
index b210438..ea71a1c 100644
--- a/tools/rostest/cmake/rostest-extras.cmake.em
+++ b/tools/rostest/cmake/rostest-extras.cmake.em
@@ -12,7 +12,7 @@ function(add_rostest file)
   set(ROSTEST_EXE "${PYTHON_EXECUTABLE} @(PROJECT_SOURCE_DIR)/scripts/rostest")
 @[else]@
   # bin in installspace
-  set(ROSTEST_EXE "${PYTHON_EXECUTABLE} ${rostest_DIR}/../../../@(CATKIN_GLOBAL_BIN_DESTINATION)/rostest")
+  set(ROSTEST_EXE "${PYTHON_EXECUTABLE} @(CMAKE_INSTALL_PREFIX)/@(CATKIN_GLOBAL_BIN_DESTINATION)/rostest")
 @[end if]@
 
   cmake_parse_arguments(_rostest "" "WORKING_DIRECTORY" "ARGS;DEPENDENCIES" ${ARGN})