From 65a090ff5191ad73d4a120bc4e18ab68159cbaae Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Wed, 25 Mar 2020 17:55:18 +0100
Subject: [PATCH] Listcomponents: only DD4hepDIR for macOS
Also only TARGET_FILE_NAME instead of full
---
cmake/DD4hep.cmake | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/cmake/DD4hep.cmake b/cmake/DD4hep.cmake
index 20dc19696..14f9cb3e5 100644
--- a/cmake/DD4hep.cmake
+++ b/cmake/DD4hep.cmake
@@ -72,16 +72,17 @@ function(dd4hep_generate_rootmap library)
if(APPLE)
set(ENV_VAR DYLD_LIBRARY_PATH)
+ set(${ENV_VAR}_VALUE $<TARGET_FILE_DIR:${library}>:$<TARGET_FILE_DIR:DD4hep::DD4hepGaudiPluginMgr>)
else()
set(ENV_VAR LD_LIBRARY_PATH)
+ set(${ENV_VAR}_VALUE $<TARGET_FILE_DIR:${library}>:$<TARGET_FILE_DIR:DD4hep::DD4hepGaudiPluginMgr>:$ENV{${ENV_VAR}})
endif()
- SET(ENV{${ENV_VAR}} $<TARGET_FILE_DIR:${library}>:$ENV{${ENV_VAR}}:$ENV{DD4HEP_LIBRARY_PATH} )
set(rootmapfile ${CMAKE_SHARED_MODULE_PREFIX}${library}.components)
add_custom_command(OUTPUT ${rootmapfile}
DEPENDS ${library}
- COMMAND ${ENV_VAR}=$ENV{${ENV_VAR}} $<TARGET_FILE:DD4hep::listcomponents> -o ${rootmapfile} $<TARGET_FILE:${library}>
+ COMMAND ${ENV_VAR}=${ENV_VAR}_VALUE $<TARGET_FILE:DD4hep::listcomponents> -o ${rootmapfile} $<TARGET_FILE_NAME:${library}>
WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
)
--
GitLab