Skip to content
Snippets Groups Projects
Commit 84c1df39 authored by Marko Petric's avatar Marko Petric
Browse files

fix macOS env for tests

parent b7c1d0b3
No related branches found
No related tags found
No related merge requests found
...@@ -21,7 +21,6 @@ for i in "$@" ; do ...@@ -21,7 +21,6 @@ for i in "$@" ; do
fi fi
done done
export DYLD_LIBRARY_PATH=$DD4HEP_LIBRARY_PATH
echo " #### LD_LIBRARY_PATH = : ${LD_LIBRARY_PATH}" echo " #### LD_LIBRARY_PATH = : ${LD_LIBRARY_PATH}"
echo " #### DYLD_LIBRARY_PATH = : ${DYLD_LIBRARY_PATH}" echo " #### DYLD_LIBRARY_PATH = : ${DYLD_LIBRARY_PATH}"
......
...@@ -20,7 +20,6 @@ for i in "$@" ; do ...@@ -20,7 +20,6 @@ for i in "$@" ; do
fi fi
done done
export DYLD_LIBRARY_PATH=$DD4HEP_LIBRARY_PATH
echo " #### LD_LIBRARY_PATH = : ${LD_LIBRARY_PATH}" echo " #### LD_LIBRARY_PATH = : ${LD_LIBRARY_PATH}"
echo " #### DYLD_LIBRARY_PATH = : ${DYLD_LIBRARY_PATH}" echo " #### DYLD_LIBRARY_PATH = : ${DYLD_LIBRARY_PATH}"
......
...@@ -43,13 +43,15 @@ dd4hep_add_path() { ...@@ -43,13 +43,15 @@ dd4hep_add_path() {
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
dd4hep_add_library_path() { dd4hep_add_library_path() {
path_prefix=${1}; path_prefix=${1};
if [ @USE_DYLD@ ]; if [ @APPLE@ ];
then then
if [ ${DYLD_LIBRARY_PATH} ]; then if [ ${DYLD_LIBRARY_PATH} ]; then
export DYLD_LIBRARY_PATH=${path_prefix}:$DYLD_LIBRARY_PATH; 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; export DD4HEP_LIBRARY_PATH=${path_prefix}:$DD4HEP_LIBRARY_PATH;
else else
export DYLD_LIBRARY_PATH=${path_prefix}; export DYLD_LIBRARY_PATH=${path_prefix};
export LD_LIBRARY_PATH=${path_prefix};
export DD4HEP_LIBRARY_PATH=${path_prefix}; export DD4HEP_LIBRARY_PATH=${path_prefix};
fi; fi;
else else
......
#!/bin/bash
################################################################################# #################################################################################
# #
# Environment script for DD4hep examples - initializes DD4hep (and ROOT) # Environment script for DD4hep examples - initializes DD4hep (and ROOT)
...@@ -17,7 +16,12 @@ if [ @CLHEP_DIR@ ]; then ...@@ -17,7 +16,12 @@ if [ @CLHEP_DIR@ ]; then
fi; fi;
source ${DD4hep_DIR}/bin/thisdd4hep.sh; 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--------------------------------------------------------------------- #----PATH---------------------------------------------------------------------
dd4hep_add_path PATH ${THIS}/bin; dd4hep_add_path PATH ${THIS}/bin;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment