diff --git a/CMakeLists.txt b/CMakeLists.txt index db1a9ac10f9ca84510dfab249b5fa87b3c0d4fd1..518baf442fc0a576a2d237ca1939f062366868da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,12 +59,6 @@ IF(${CMAKE_CXX_STANDARD} LESS 14) MESSAGE(FATAL_ERROR "DD4hep requires at least CXX Standard 14 to compile") ENDIF() -# ----for APPLE scripts have to set the DYLD_LIBRARY_PATH -if(APPLE) - set(USE_DYLD 1) - set(CMAKE_MACOSX_RPATH 1) -endif() - ############################### # Define DD4hep build options # ############################### diff --git a/DDParsersStandAlone/CMakeLists.txt b/DDParsersStandAlone/CMakeLists.txt index 669f7799b7b6461a4a60f9edc8ba7b08587cbe43..51e2befc406b5cc877365d2d24a5e2a30405f1b4 100644 --- a/DDParsersStandAlone/CMakeLists.txt +++ b/DDParsersStandAlone/CMakeLists.txt @@ -52,11 +52,6 @@ include(DD4hepMacros) add_subdirectory(DDParsers) # #---Configuration------------------------------------------------------------------- -# ----for APPLE scripts have to set the DYLD_LIBRARY_PATH -if( APPLE ) - set( USE_DYLD 1) - set(CMAKE_MACOSX_RPATH 1) -endif() #----------------------------------------------------------------------------------- display_std_variables() diff --git a/cmake/DD4hepConfig.cmake.in b/cmake/DD4hepConfig.cmake.in index f1e309c8e1650b7a3be4e9521d9779da29d763f2..7e4c968c50c0470b747049a6e37e885c106283d6 100644 --- a/cmake/DD4hepConfig.cmake.in +++ b/cmake/DD4hepConfig.cmake.in @@ -97,11 +97,6 @@ ENDIF() #---- build with xercesc or tinyxml ? INCLUDE( ${@CMAKE_PROJECT_NAME@_DIR}/cmake/DD4hep_XML_setup.cmake ) -#----- APPLE ? ------- - -set( USE_DYLD @USE_DYLD@ ) -MARK_AS_ADVANCED( USE_DYLD ) - # ---------- final checking --------------------------------------------------- INCLUDE( FindPackageHandleStandardArgs ) # set DD4HEP_FOUND to TRUE if all listed variables are TRUE and not empty diff --git a/cmake/thisdd4hep.sh b/cmake/thisdd4hep.sh index 2ceadc4d57ff92370612b453f0e52da5cd02fbc4..7fb873698fe9d2f01c6fae3d8cd2e7272252e86d 100644 --- a/cmake/thisdd4hep.sh +++ b/cmake/thisdd4hep.sh @@ -112,7 +112,7 @@ dd4hep_add_path PYTHONPATH ${THIS}/@DD4HEP_PYTHON_INSTALL_DIR@; #----ROOT_INCLUDE_PATH-------------------------------------------------------- dd4hep_add_path ROOT_INCLUDE_PATH ${THIS}/include; #----------------------------------------------------------------------------- -if [ @USE_DYLD@ ]; +if [ @APPLE@ ]; then export DD4HEP_LIBRARY_PATH=${DYLD_LIBRARY_PATH}; else diff --git a/cmake/thisdd4hep_only.sh b/cmake/thisdd4hep_only.sh index 81fae3094b8b493477232512cf723e6ec0893480..4fcea0ae088699a26873178a57c72adf3fd4d7fd 100644 --- a/cmake/thisdd4hep_only.sh +++ b/cmake/thisdd4hep_only.sh @@ -78,7 +78,7 @@ dd4hep_add_path PYTHONPATH ${THIS}/@DD4HEP_PYTHON_INSTALL_DIR@; #----ROOT_INCLUDE_PATH-------------------------------------------------------- dd4hep_add_path ROOT_INCLUDE_PATH ${THIS}/include; #----------------------------------------------------------------------------- -if [ @USE_DYLD@ ]; +if [ @APPLE@ ]; then export DD4HEP_LIBRARY_PATH=${DYLD_LIBRARY_PATH}; else