From f3f9961c6d861aca0bb0aed4c22cacbe241da45f Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Wed, 4 Dec 2019 13:45:03 +0100
Subject: [PATCH] Cmake: generate root map on apple: set DYLD_LIBRARY_PATH
environment
---
cmake/DD4hep.cmake | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/cmake/DD4hep.cmake b/cmake/DD4hep.cmake
index 77ca370ae..33eec28ca 100644
--- a/cmake/DD4hep.cmake
+++ b/cmake/DD4hep.cmake
@@ -76,10 +76,9 @@ endfunction()
#---------------------------------------------------------------------------------------------------
function(dd4hep_generate_rootmap library)
if(APPLE)
- dd4hep_generate_rootmap_apple( ${library} )
- else()
- dd4hep_generate_rootmap_notapple( ${library} )
+ SET(ENV{DYLD_LIBRARY_PATH} ${LIBRARY_OUTPUT_PATH}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DD4HEP_LIBRARY_PATH} )
endif()
+ dd4hep_generate_rootmap_notapple(${library} )
endfunction()
#---------------------------------------------------------------------------------------------------
function(dd4hep_generate_rootmap_notapple library)
@@ -103,10 +102,3 @@ function(dd4hep_generate_rootmap_notapple library)
DESTINATION ${install_destination}
)
endfunction()
-#
-#
-#---------------------------------------------------------------------------------------------------
-function(dd4hep_generate_rootmap_apple library)
- # for now do the same for apple that is done for the rest
- dd4hep_generate_rootmap_notapple( ${library} )
-endfunction()
--
GitLab