From 6a083b55ed3b0b7f00193fb88252dece28fc3371 Mon Sep 17 00:00:00 2001
From: Frank Gaede <frank.gaede@desy.de>
Date: Fri, 6 Sep 2013 13:16:17 +0000
Subject: [PATCH] - adapted the pathes to the installation directory (./bin)
---
cmake/thisdd4hep.csh | 12 ++++++------
cmake/thisdd4hep.sh | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/cmake/thisdd4hep.csh b/cmake/thisdd4hep.csh
index c1584fd4b..e483b8dc0 100644
--- a/cmake/thisdd4hep.csh
+++ b/cmake/thisdd4hep.csh
@@ -10,23 +10,23 @@ set THIS="`dirname ${ARGS[2]}`"
#----PATH----------------------------------------------------------------------------
if ($?PATH) then
- setenv PATH @EXECUTABLE_OUTPUT_PATH@:$PATH # Linux, ELF HP-UX
+ setenv PATH @CMAKE_INSTALL_PREFIX@/bin:$PATH # Linux, ELF HP-UX
else
- setenv PATH @EXECUTABLE_OUTPUT_PATH@
+ setenv PATH @CMAKE_INSTALL_PREFIX@/bin
endif
#----LD_LIBRARY_PATH-----------------------------------------------------------------
if ($?LD_LIBRARY_PATH) then
- setenv LD_LIBRARY_PATH @LIBRARY_OUTPUT_PATH@:@XERCESC_ROOT_DIR@/lib:$LD_LIBRARY_PATH # Linux, ELF HP-UX
+ setenv LD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib:@XERCESC_ROOT_DIR@/lib:$LD_LIBRARY_PATH # Linux, ELF HP-UX
else
- setenv LD_LIBRARY_PATH @LIBRARY_OUTPUT_PATH@:@XERCESC_ROOT_DIR@/lib
+ setenv LD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib:@XERCESC_ROOT_DIR@/lib
endif
#----DYLD_LIBRARY_PATH---------------------------------------------------------------
if ($?DYLD_LIBRARY_PATH) then
- setenv DYLD_LIBRARY_PATH @LIBRARY_OUTPUT_PATH@:@XERCESC_ROOT_DIR@/lib:$DYLD_LIBRARY_PATH # Mac OS X
+ setenv DYLD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib:@XERCESC_ROOT_DIR@/lib:$DYLD_LIBRARY_PATH # Mac OS X
else
- setenv DYLD_LIBRARY_PATH @LIBRARY_OUTPUT_PATH@:@XERCESC_ROOT_DIR@/lib
+ setenv DYLD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib:@XERCESC_ROOT_DIR@/lib
endif
#----PYTHONPATH---------------------------------------------------------------
diff --git a/cmake/thisdd4hep.sh b/cmake/thisdd4hep.sh
index 05b55c088..56628e5b9 100644
--- a/cmake/thisdd4hep.sh
+++ b/cmake/thisdd4hep.sh
@@ -18,23 +18,23 @@ fi
#----PATH-----------------------------------------------------------------
if [ -z "${PATH}" ]; then
- PATH=@EXECUTABLE_OUTPUT_PATH@; export PATH # Linux, ELF HP-UX
+ PATH=@CMAKE_INSTALL_PREFIX@/bin; export PATH # Linux, ELF HP-UX
else
- PATH=@EXECUTABLE_OUTPUT_PATH@:$PATH; export PATH
+ PATH=@CMAKE_INSTALL_PREFIX@/bin:$PATH; export PATH
fi
#----LD_LIBRARY_PATH-----------------------------------------------------------------
if [ -z "${LD_LIBRARY_PATH}" ]; then
- LD_LIBRARY_PATH=@LIBRARY_OUTPUT_PATH@:@XERCESC_ROOT_DIR@/lib:@ROOT_LIBRARY_DIR@:@Geant4_DIR@/..; export LD_LIBRARY_PATH # Linux, ELF HP-UX
+ LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:@XERCESC_ROOT_DIR@/lib:@ROOT_LIBRARY_DIR@:@Geant4_DIR@/..; export LD_LIBRARY_PATH # Linux, ELF HP-UX
else
- LD_LIBRARY_PATH=@LIBRARY_OUTPUT_PATH@:@XERCESC_ROOT_DIR@/lib:@ROOT_LIBRARY_DIR@:@Geant4_DIR@/..:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
+ LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:@XERCESC_ROOT_DIR@/lib:@ROOT_LIBRARY_DIR@:@Geant4_DIR@/..:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
fi
#----DYLD_LIBRARY_PATH---------------------------------------------------------------
if [ -z "${DYLD_LIBRARY_PATH}" ]; then
- DYLD_LIBRARY_PATH=@LIBRARY_OUTPUT_PATH@:@XERCESC_ROOT_DIR@/lib:@ROOT_LIBRARY_DIR@; export DYLD_LIBRARY_PATH # Mac OS X
+ DYLD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:@XERCESC_ROOT_DIR@/lib:@ROOT_LIBRARY_DIR@; export DYLD_LIBRARY_PATH # Mac OS X
else
- DYLD_LIBRARY_PATH=@LIBRARY_OUTPUT_PATH@:@XERCESC_ROOT_DIR@/lib:@ROOT_LIBRARY_DIR@:$DYLD_LIBRARY_PATH; export DYLD_LIBRARY_PATH
+ DYLD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:@XERCESC_ROOT_DIR@/lib:@ROOT_LIBRARY_DIR@:$DYLD_LIBRARY_PATH; export DYLD_LIBRARY_PATH
fi
#----PYTHONPATH---------------------------------------------------------------
--
GitLab