diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py index ed48de44076eb3eaa5237d8f156d08a22cf56938..4cc2698d09b625be70dd7a1e454e671edb2dd963 100644 --- a/DDG4/python/DDG4.py +++ b/DDG4/python/DDG4.py @@ -23,6 +23,7 @@ def loadDDG4(): ROOT.gErrorIgnoreLevel=orgLevel import platform + import os if platform.system()=="Darwin": gSystem.SetDynamicPath(os.environ['DD4HEP_LIBRARY_PATH']) diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake index 300c2ae53bc958c89998a86bdcf6773a59c0548e..aa41a08d82d308114e35028544705907e129a584 100644 --- a/cmake/DD4hepBuild.cmake +++ b/cmake/DD4hepBuild.cmake @@ -57,15 +57,15 @@ macro(dd4hep_set_compiler_flags) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND APPLE) set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -undefined dynamic_lookup") # All this simply does not work! -# if ( APPLE ) -# set(CMAKE_SKIP_BUILD_RPATH FALSE) -# set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -# set(CMAKE_INSTALL_RPATH "${CMAKE_BINARY_DIR}/lib") -# set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + if ( APPLE ) + set(CMAKE_SKIP_BUILD_RPATH FALSE) + set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + set(CMAKE_INSTALL_RPATH "${CMAKE_BINARY_DIR}/lib") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-rpath ${CMAKE_BINARY_DIR}/lib") # message( STATUS "Apple settings: CMAKE_INSTALL_RPATH: ${CMAKE_INSTALL_RPATH}" ) # message( STATUS "Apple settings: CMAKE_SHARED_LINKER_FLAGS: ${CMAKE_SHARED_LINKER_FLAGS}" ) -# endif() + endif() endif() endmacro(dd4hep_set_compiler_flags)