From 59d595eccb0c2b1ea33ed5ce5eef5015e3cf4097 Mon Sep 17 00:00:00 2001
From: krebs <franziska.krebs@kit.edu>
Date: Thu, 13 Mar 2025 17:29:46 +0100
Subject: [PATCH] adaptions to change handling of CMAKE_PREFIX_PATH for gazebo
---
data/modules/armarx/ArmarXSimulation.json | 1 +
data/modules/deps/gazebosim/gz-cmake.json | 2 +-
data/modules/deps/gazebosim/gz-math.json | 2 +-
data/modules/deps/gazebosim/gz-utils.json | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/data/modules/armarx/ArmarXSimulation.json b/data/modules/armarx/ArmarXSimulation.json
index f486cad4d..308e147f7 100644
--- a/data/modules/armarx/ArmarXSimulation.json
+++ b/data/modules/armarx/ArmarXSimulation.json
@@ -14,6 +14,7 @@
"definitions": {
"CMAKE_C_COMPILER": "$ARMARX_C_COMPILER",
"CMAKE_CXX_COMPILER": "$ARMARX_CXX_COMPILER"
+ "CMAKE_PREFIX_PATH": "$CMAKE_PREFIX_PATH:$CMAKE_PREFIX_PATH_GAZEBO"
}
}
},
diff --git a/data/modules/deps/gazebosim/gz-cmake.json b/data/modules/deps/gazebosim/gz-cmake.json
index 9fa8d06c7..23269c2a7 100644
--- a/data/modules/deps/gazebosim/gz-cmake.json
+++ b/data/modules/deps/gazebosim/gz-cmake.json
@@ -31,7 +31,7 @@
"install": {
"cmake": {},
"env": {
- "CMAKE_PREFIX_PATH": "$CMAKE_PREFIX_PATH:$MODULE_PATH/build/install",
+ "CMAKE_PREFIX_PATH_GAZEBO": "$CMAKE_PREFIX_PATH_GAZEBO:$MODULE_PATH/build/install",
"LD_LIBRARY_PATH": "$LD_LIBRARY_PATH:$MODULE_PATH/build/install/lib"
}
},
diff --git a/data/modules/deps/gazebosim/gz-math.json b/data/modules/deps/gazebosim/gz-math.json
index b029d6932..035fc56e4 100644
--- a/data/modules/deps/gazebosim/gz-math.json
+++ b/data/modules/deps/gazebosim/gz-math.json
@@ -33,7 +33,7 @@
"install": {
"cmake": {},
"env": {
- "CMAKE_PREFIX_PATH": "$CMAKE_PREFIX_PATH:$MODULE_PATH/build/install",
+ "CMAKE_PREFIX_PATH_GAZEBO": "$CMAKE_PREFIX_PATH_GAZEBO:$MODULE_PATH/build/install",
"LD_LIBRARY_PATH": "$LD_LIBRARY_PATH:$MODULE_PATH/build/install/lib"
}
},
diff --git a/data/modules/deps/gazebosim/gz-utils.json b/data/modules/deps/gazebosim/gz-utils.json
index 2541b86da..3b6adc615 100644
--- a/data/modules/deps/gazebosim/gz-utils.json
+++ b/data/modules/deps/gazebosim/gz-utils.json
@@ -31,7 +31,7 @@
"install": {
"cmake": {},
"env": {
- "CMAKE_PREFIX_PATH": "$CMAKE_PREFIX_PATH:$MODULE_PATH/build/install",
+ "CMAKE_PREFIX_PATH_GAZEBO": "$CMAKE_PREFIX_PATH_GAZEBO:$MODULE_PATH/build/install",
"LD_LIBRARY_PATH": "$LD_LIBRARY_PATH:$MODULE_PATH/build/install/lib"
}
},
--
GitLab