From d4c3ac3060d5024de8cc8de713ecb3cccd089de9 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 2 Feb 2023 15:44:35 -0500
Subject: [PATCH] DD4hep.cmake: respect DYLD_LIBRARY_PATH when running
listcomponents
Dropping DYLD_LIBRARY_PATH produces macOS-only issues when ROOT
libraries are linked with -Drpath=ON. Users of a broken
DYLD_LIBRARY_PATH should be able to unset it manually.
This partially reverts 65a090ff5191ad73d4a120bc4e18ab68159cbaae .
---
cmake/DD4hep.cmake | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/cmake/DD4hep.cmake b/cmake/DD4hep.cmake
index 7bc1d6a46..68861eed7 100644
--- a/cmake/DD4hep.cmake
+++ b/cmake/DD4hep.cmake
@@ -72,11 +72,10 @@ 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_VAR}_VALUE $<TARGET_FILE_DIR:${library}>:$<TARGET_FILE_DIR:DD4hep::DD4hepGaudiPluginMgr>:$ENV{${ENV_VAR}})
set(rootmapfile ${CMAKE_SHARED_MODULE_PREFIX}${library}.components)
--
GitLab