From 19733b29f5be141686f92a318418205659c7d495 Mon Sep 17 00:00:00 2001 From: Markus Frank <markus.frank@cern.ch> Date: Wed, 20 Feb 2013 15:32:13 +0000 Subject: [PATCH] Please see doc/release.notes --- DDCore/CMakeLists.txt | 2 ++ cmake/thisdd4hep.csh | 7 +++++++ cmake/thisdd4hep.sh | 7 +++++++ 3 files changed, 16 insertions(+) diff --git a/DDCore/CMakeLists.txt b/DDCore/CMakeLists.txt index bfe5575a3..7c6db6a1b 100644 --- a/DDCore/CMakeLists.txt +++ b/DDCore/CMakeLists.txt @@ -26,5 +26,7 @@ endif() add_library(DD4hepCore SHARED ${sources}) target_link_libraries(DD4hepCore ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} Geom Reflex ${libraries}) +#---Rootmap generation-------------------------------------------------------------- +dd4hep_generate_rootmap(DD4hepCore) diff --git a/cmake/thisdd4hep.csh b/cmake/thisdd4hep.csh index 07b8b1ee9..c1584fd4b 100644 --- a/cmake/thisdd4hep.csh +++ b/cmake/thisdd4hep.csh @@ -8,6 +8,13 @@ set ARGS=($_) set THIS="`dirname ${ARGS[2]}`" +#----PATH---------------------------------------------------------------------------- +if ($?PATH) then + setenv PATH @EXECUTABLE_OUTPUT_PATH@:$PATH # Linux, ELF HP-UX +else + setenv PATH @EXECUTABLE_OUTPUT_PATH@ +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 diff --git a/cmake/thisdd4hep.sh b/cmake/thisdd4hep.sh index 4bbf0f230..502464d88 100644 --- a/cmake/thisdd4hep.sh +++ b/cmake/thisdd4hep.sh @@ -16,6 +16,13 @@ else THIS=$(dirname ${BASH_ARGV[0]}) fi +#----PATH----------------------------------------------------------------- +if [ -z "${PATH}" ]; then + PATH=@EXECUTABLE_OUTPUT_PATH@; export PATH # Linux, ELF HP-UX +else + PATH=@EXECUTABLE_OUTPUT_PATH@:$PATH; export PATH +fi + #----LD_LIBRARY_PATH----------------------------------------------------------------- if [ -z "${LD_LIBRARY_PATH}" ]; then LD_LIBRARY_PATH=@LIBRARY_OUTPUT_PATH@:@XERCESC_ROOT_DIR@/lib; export LD_LIBRARY_PATH # Linux, ELF HP-UX -- GitLab