From 9470042e52ce7559b53c6ff40d1de08b4085c8b7 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Thu, 20 Feb 2020 18:42:12 +0100
Subject: [PATCH] MakeGaudiMap: add DD4hep::DDCore location to
(DY)LD_LIBRARY_PATH
---
cmake/DD4hep.cmake | 1 +
cmake/MakeGaudiMap.cmake | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cmake/DD4hep.cmake b/cmake/DD4hep.cmake
index fc0b46d84..ce7678502 100644
--- a/cmake/DD4hep.cmake
+++ b/cmake/DD4hep.cmake
@@ -94,6 +94,7 @@ function(dd4hep_generate_rootmap_notapple library)
COMMAND ${CMAKE_COMMAND} -Dlibname=$<TARGET_FILE_NAME:${library}> -Drootmapfile=${rootmapfile}
-DDD4HEP_LISTCOMPONENTS_CMD=$<TARGET_FILE:DD4hep::listcomponents>
-DLIBRARY_LOCATION=$<TARGET_FILE_DIR:${library}>
+ -DDD4HEP_LIBRARY_LOCATION=$<TARGET_FILE_DIR:DD4hep::DDCore>
-DDD4hep_DIR=${DD4hep_DIR}
-P ${DD4hep_DIR}/cmake/MakeGaudiMap.cmake)
add_custom_target(Components_${library} ALL DEPENDS ${rootmapfile})
diff --git a/cmake/MakeGaudiMap.cmake b/cmake/MakeGaudiMap.cmake
index e683e943b..3288dcba9 100644
--- a/cmake/MakeGaudiMap.cmake
+++ b/cmake/MakeGaudiMap.cmake
@@ -7,10 +7,10 @@ message(STATUS " *** Gaudi listcomponents: Generate map for ${libname} ..." )
)
GET_FILENAME_COMPONENT(GAUDI_LISTCOMP_INSTALL ${DD4HEP_LISTCOMPONENTS_CMD} DIRECTORY)
if(APPLE)
- SET ( ENV{DYLD_LIBRARY_PATH} ${LIBRARY_LOCATION}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DD4HEP_LIBRARY_PATH} )
+ SET ( ENV{DYLD_LIBRARY_PATH} ${LIBRARY_LOCATION}:${DD4HEP_LIBRARY_LOCATION}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DD4HEP_LIBRARY_PATH} )
##EXECUTE_PROCESS( COMMAND echo DYLD_LIBRARY_PATH = $ENV{DYLD_LIBRARY_PATH} )
else()
- SET ( ENV{LD_LIBRARY_PATH} ${LIBRARY_LOCATION}:${GAUDI_LISTCOMP_INSTALL}:$ENV{LD_LIBRARY_PATH} )
+ SET ( ENV{LD_LIBRARY_PATH} ${LIBRARY_LOCATION}:${DD4HEP_LIBRARY_LOCATION}:$ENV{LD_LIBRARY_PATH} )
endif()
# EXECUTE_PROCESS( COMMAND echo LD_LIBRARY_PATH = $ENV{LD_LIBRARY_PATH} )
EXECUTE_PROCESS( COMMAND
--
GitLab