From 84c1df3978cd7891855adecbcc19ed6c304ab642 Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Wed, 25 Mar 2020 20:34:05 +0100
Subject: [PATCH] fix macOS env for tests
---
cmake/run_test.sh | 1 -
cmake/run_test_package.sh | 1 -
cmake/thisdd4hep.sh | 4 +++-
cmake/thisdd4hep_package.sh.in | 8 ++++++--
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/cmake/run_test.sh b/cmake/run_test.sh
index 40c53bd55..8a61bee4d 100755
--- a/cmake/run_test.sh
+++ b/cmake/run_test.sh
@@ -21,7 +21,6 @@ for i in "$@" ; do
fi
done
-export DYLD_LIBRARY_PATH=$DD4HEP_LIBRARY_PATH
echo " #### LD_LIBRARY_PATH = : ${LD_LIBRARY_PATH}"
echo " #### DYLD_LIBRARY_PATH = : ${DYLD_LIBRARY_PATH}"
diff --git a/cmake/run_test_package.sh b/cmake/run_test_package.sh
index 48b1d9d20..18cf2aae7 100755
--- a/cmake/run_test_package.sh
+++ b/cmake/run_test_package.sh
@@ -20,7 +20,6 @@ for i in "$@" ; do
fi
done
-export DYLD_LIBRARY_PATH=$DD4HEP_LIBRARY_PATH
echo " #### LD_LIBRARY_PATH = : ${LD_LIBRARY_PATH}"
echo " #### DYLD_LIBRARY_PATH = : ${DYLD_LIBRARY_PATH}"
diff --git a/cmake/thisdd4hep.sh b/cmake/thisdd4hep.sh
index b3c4fc499..e8dca65a9 100644
--- a/cmake/thisdd4hep.sh
+++ b/cmake/thisdd4hep.sh
@@ -43,13 +43,15 @@ dd4hep_add_path() {
#-----------------------------------------------------------------------------
dd4hep_add_library_path() {
path_prefix=${1};
- if [ @USE_DYLD@ ];
+ if [ @APPLE@ ];
then
if [ ${DYLD_LIBRARY_PATH} ]; then
export DYLD_LIBRARY_PATH=${path_prefix}:$DYLD_LIBRARY_PATH;
+ export LD_LIBRARY_PATH=${path_prefix}:$LD_LIBRARY_PATH;
export DD4HEP_LIBRARY_PATH=${path_prefix}:$DD4HEP_LIBRARY_PATH;
else
export DYLD_LIBRARY_PATH=${path_prefix};
+ export LD_LIBRARY_PATH=${path_prefix};
export DD4HEP_LIBRARY_PATH=${path_prefix};
fi;
else
diff --git a/cmake/thisdd4hep_package.sh.in b/cmake/thisdd4hep_package.sh.in
index 65adfbd59..4e2ddead5 100644
--- a/cmake/thisdd4hep_package.sh.in
+++ b/cmake/thisdd4hep_package.sh.in
@@ -1,4 +1,3 @@
-#!/bin/bash
#################################################################################
#
# Environment script for DD4hep examples - initializes DD4hep (and ROOT)
@@ -17,7 +16,12 @@ if [ @CLHEP_DIR@ ]; then
fi;
source ${DD4hep_DIR}/bin/thisdd4hep.sh;
#
-dd4hep_parse_this ${BASH_ARGV[0]} @PackageName@;
+SOURCE=${BASH_ARGV[0]}
+if [ "x$SOURCE" = "x" ]; then
+ SOURCE=${(%):-%N} # for zsh
+fi
+
+dd4hep_parse_this $SOURCE;
#
#----PATH---------------------------------------------------------------------
dd4hep_add_path PATH ${THIS}/bin;
--
GitLab