From 0fb59d316bea5673602afaecf4ef35664a2a1f5b Mon Sep 17 00:00:00 2001
From: Ole Hansen <ole@jlab.org>
Date: Wed, 18 Nov 2020 17:47:41 -0500
Subject: [PATCH] Remove obsolete USE_DYLD CMake variable in favor of APPLE
---
CMakeLists.txt | 6 ------
DDParsersStandAlone/CMakeLists.txt | 5 -----
cmake/DD4hepConfig.cmake.in | 5 -----
cmake/thisdd4hep.sh | 2 +-
cmake/thisdd4hep_only.sh | 2 +-
5 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index db1a9ac10..518baf442 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 669f7799b..51e2befc4 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 f1e309c8e..7e4c968c5 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 2ceadc4d5..7fb873698 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 81fae3094..4fcea0ae0 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
--
GitLab