Skip to content

Commit 0fb59d3

Browse files
hansenjoMarko Petric
authored and
Marko Petric
committed
Remove obsolete USE_DYLD CMake variable in favor of APPLE
1 parent 59fadab commit 0fb59d3

File tree

5 files changed

+2
-18
lines changed

5 files changed

+2
-18
lines changed

CMakeLists.txt

-6
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@ IF(${CMAKE_CXX_STANDARD} LESS 14)
5959
MESSAGE(FATAL_ERROR "DD4hep requires at least CXX Standard 14 to compile")
6060
ENDIF()
6161

62-
# ----for APPLE scripts have to set the DYLD_LIBRARY_PATH
63-
if(APPLE)
64-
set(USE_DYLD 1)
65-
set(CMAKE_MACOSX_RPATH 1)
66-
endif()
67-
6862
###############################
6963
# Define DD4hep build options #
7064
###############################

DDParsersStandAlone/CMakeLists.txt

-5
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ include(DD4hepMacros)
5252
add_subdirectory(DDParsers)
5353
#
5454
#---Configuration-------------------------------------------------------------------
55-
# ----for APPLE scripts have to set the DYLD_LIBRARY_PATH
56-
if( APPLE )
57-
set( USE_DYLD 1)
58-
set(CMAKE_MACOSX_RPATH 1)
59-
endif()
6055
#-----------------------------------------------------------------------------------
6156
display_std_variables()
6257

cmake/DD4hepConfig.cmake.in

-5
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@ ENDIF()
9797
#---- build with xercesc or tinyxml ?
9898
INCLUDE( ${@CMAKE_PROJECT_NAME@_DIR}/cmake/DD4hep_XML_setup.cmake )
9999

100-
#----- APPLE ? -------
101-
102-
set( USE_DYLD @USE_DYLD@ )
103-
MARK_AS_ADVANCED( USE_DYLD )
104-
105100
# ---------- final checking ---------------------------------------------------
106101
INCLUDE( FindPackageHandleStandardArgs )
107102
# set DD4HEP_FOUND to TRUE if all listed variables are TRUE and not empty

cmake/thisdd4hep.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ dd4hep_add_path PYTHONPATH ${THIS}/@DD4HEP_PYTHON_INSTALL_DIR@;
112112
#----ROOT_INCLUDE_PATH--------------------------------------------------------
113113
dd4hep_add_path ROOT_INCLUDE_PATH ${THIS}/include;
114114
#-----------------------------------------------------------------------------
115-
if [ @USE_DYLD@ ];
115+
if [ @APPLE@ ];
116116
then
117117
export DD4HEP_LIBRARY_PATH=${DYLD_LIBRARY_PATH};
118118
else

cmake/thisdd4hep_only.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ dd4hep_add_path PYTHONPATH ${THIS}/@DD4HEP_PYTHON_INSTALL_DIR@;
7878
#----ROOT_INCLUDE_PATH--------------------------------------------------------
7979
dd4hep_add_path ROOT_INCLUDE_PATH ${THIS}/include;
8080
#-----------------------------------------------------------------------------
81-
if [ @USE_DYLD@ ];
81+
if [ @APPLE@ ];
8282
then
8383
export DD4HEP_LIBRARY_PATH=${DYLD_LIBRARY_PATH};
8484
else

0 commit comments

Comments
 (0)