From a4ee689a18c9625ef6e07318752e76c57928fc0a Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Fri, 21 Feb 2020 14:36:54 +0100
Subject: [PATCH] Listcomponents: add setting of environment variable to
listcomponents call
---
cmake/DD4hep.cmake | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/cmake/DD4hep.cmake b/cmake/DD4hep.cmake
index 5b0fd59a1..c0b052f28 100644
--- a/cmake/DD4hep.cmake
+++ b/cmake/DD4hep.cmake
@@ -71,6 +71,9 @@ endfunction()
function(dd4hep_generate_rootmap library)
if(APPLE)
SET(ENV{DYLD_LIBRARY_PATH} ${LIBRARY_OUTPUT_PATH}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DD4HEP_LIBRARY_PATH} )
+ set(ENV_VAR DYLD_LIBRARY_PATH)
+ else()
+ set(ENV_VAR LD_LIBRARY_PATH)
endif()
if ( NOT DD4hep_DIR )
@@ -80,9 +83,9 @@ function(dd4hep_generate_rootmap library)
add_custom_command(OUTPUT ${rootmapfile}
DEPENDS ${library}
- COMMAND echo DYLD_LIBRARY_PATH: $ENV{DYLD_LIBRARY_PATH}
- COMMAND echo LD_LIBRARY_PATH: $ENV{LD_LIBRARY_PATH}
- COMMAND DD4hep::listcomponents -o ${rootmapfile} $<TARGET_FILE:${library}>
+ COMMAND ${ENV_VAR}=$ENV{${ENV_VAR}} echo DYLD_LIBRARY_PATH: $ENV{DYLD_LIBRARY_PATH}
+ COMMAND ${ENV_VAR}=$ENV{${ENV_VAR}} echo LD_LIBRARY_PATH: $ENV{LD_LIBRARY_PATH}
+ COMMAND ${ENV_VAR}=$ENV{${ENV_VAR}} $<TARGET_FILE:DD4hep::listcomponents> -o ${rootmapfile} $<TARGET_FILE:${library}>
WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
)
--
GitLab