File tree 5 files changed +2
-18
lines changed
5 files changed +2
-18
lines changed Original file line number Diff line number Diff line change @@ -59,12 +59,6 @@ IF(${CMAKE_CXX_STANDARD} LESS 14)
59
59
MESSAGE (FATAL_ERROR "DD4hep requires at least CXX Standard 14 to compile" )
60
60
ENDIF ()
61
61
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
-
68
62
###############################
69
63
# Define DD4hep build options #
70
64
###############################
Original file line number Diff line number Diff line change @@ -52,11 +52,6 @@ include(DD4hepMacros)
52
52
add_subdirectory (DDParsers)
53
53
#
54
54
#---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 ()
60
55
#-----------------------------------------------------------------------------------
61
56
display_std_variables()
62
57
Original file line number Diff line number Diff line change @@ -97,11 +97,6 @@ ENDIF()
97
97
#---- build with xercesc or tinyxml ?
98
98
INCLUDE ( ${@CMAKE_PROJECT_NAME @_DIR}/cmake/DD4hep_XML_setup.cmake )
99
99
100
- #----- APPLE ? -------
101
-
102
- set ( USE_DYLD @USE_DYLD@ )
103
- MARK_AS_ADVANCED ( USE_DYLD )
104
-
105
100
# ---------- final checking ---------------------------------------------------
106
101
INCLUDE ( FindPackageHandleStandardArgs )
107
102
# set DD4HEP_FOUND to TRUE if all listed variables are TRUE and not empty
Original file line number Diff line number Diff line change @@ -112,7 +112,7 @@ dd4hep_add_path PYTHONPATH ${THIS}/@DD4HEP_PYTHON_INSTALL_DIR@;
112
112
# ----ROOT_INCLUDE_PATH--------------------------------------------------------
113
113
dd4hep_add_path ROOT_INCLUDE_PATH ${THIS} /include;
114
114
# -----------------------------------------------------------------------------
115
- if [ @USE_DYLD @ ];
115
+ if [ @APPLE @ ];
116
116
then
117
117
export DD4HEP_LIBRARY_PATH=${DYLD_LIBRARY_PATH} ;
118
118
else
Original file line number Diff line number Diff line change @@ -78,7 +78,7 @@ dd4hep_add_path PYTHONPATH ${THIS}/@DD4HEP_PYTHON_INSTALL_DIR@;
78
78
# ----ROOT_INCLUDE_PATH--------------------------------------------------------
79
79
dd4hep_add_path ROOT_INCLUDE_PATH ${THIS} /include;
80
80
# -----------------------------------------------------------------------------
81
- if [ @USE_DYLD @ ];
81
+ if [ @APPLE @ ];
82
82
then
83
83
export DD4HEP_LIBRARY_PATH=${DYLD_LIBRARY_PATH} ;
84
84
else
You can’t perform that action at this time.
0 commit comments