From 1794c999cbf87929f91006d2695c52ab4815d974 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Wed, 18 Jan 2023 18:40:20 +0100
Subject: [PATCH] thisdd4hep: ensure we only prevent real duplicates, not paths
that share common content
---
cmake/thisdd4hep.sh | 2 +-
cmake/thisdd4hep_only.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/thisdd4hep.sh b/cmake/thisdd4hep.sh
index 7bc7d1317..c1387a926 100644
--- a/cmake/thisdd4hep.sh
+++ b/cmake/thisdd4hep.sh
@@ -34,7 +34,7 @@ dd4hep_add_path() {
local path_prefix=${2}
eval path_value=\$$path_name
# Prevent duplicates
- path_value=`echo ${path_value} | tr : '\n' | grep -v "${path_prefix}" | tr '\n' : | sed 's|:$||'`
+ path_value=`echo ${path_value} | tr : '\n' | grep -v "^${path_prefix}$" | tr '\n' : | sed 's|:$||'`
path_value="${path_prefix}${path_value:+:${path_value}}"
eval export ${path_name}='${path_value}'
unset path_value
diff --git a/cmake/thisdd4hep_only.sh b/cmake/thisdd4hep_only.sh
index b76ca88f6..984e7bbb5 100644
--- a/cmake/thisdd4hep_only.sh
+++ b/cmake/thisdd4hep_only.sh
@@ -36,7 +36,7 @@ dd4hep_add_path() {
local path_prefix=${2}
eval path_value=\$$path_name
# Prevent duplicates
- path_value=`echo ${path_value} | tr : '\n' | grep -v "${path_prefix}" | tr '\n' : | sed 's|:$||'`
+ path_value=`echo ${path_value} | tr : '\n' | grep -v "^${path_prefix}$" | tr '\n' : | sed 's|:$||'`
path_value="${path_prefix}${path_value:+:${path_value}}"
eval export ${path_name}='${path_value}'
unset path_value
--
GitLab