@@ -56,7 +56,7 @@ IF (NOT @OSX_HAVE_LOADERPATH@)
56
56
EXECUTE_PROCESS (COMMAND ln -sfn @QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@ "${QCGIDIR} /lib" )
57
57
ENDIF (NOT @OSX_HAVE_LOADERPATH@)
58
58
59
- ### copy files
59
+ ### copy files & strip qt rpath
60
60
61
61
# Qt frameworks
62
62
# Qt5 cmake does not create overall qt prefix var, only individual lib prefixes.
@@ -67,6 +67,7 @@ EXECUTE_PROCESS (COMMAND mkdir -p "${QFWDIR}")
67
67
FOREACH (QFW ${QTLISTQG} )
68
68
IF (NOT IS_DIRECTORY "${QFWDIR} /${QFW} .framework" )
69
69
COPY_FRAMEWORK("${QT_LIBRARY_DIR} " ${QFW} "${QFWDIR} " )
70
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QFWDIR} /${QFW} .framework/${QFW} " )
70
71
ENDIF ()
71
72
ENDFOREACH (QFW)
72
73
@@ -76,12 +77,14 @@ EXECUTE_PROCESS (COMMAND mkdir -p "${QPLUGDIR}/../imageformats")
76
77
FOREACH (QI qgif;qico;qjpeg;qsvg;qtiff)
77
78
IF (NOT EXISTS "${QPLUGDIR} /../imageformats/lib${QI} .dylib" )
78
79
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QT_PLUGINS_DIR@/imageformats/lib${QI} .dylib" "${QPLUGDIR} /../imageformats/lib${QI} .dylib" )
80
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QPLUGDIR} /../imageformats/lib${QI} .dylib" )
79
81
ENDIF ()
80
82
ENDFOREACH (QI)
81
83
EXECUTE_PROCESS (COMMAND mkdir -p "${QPLUGDIR} /../platforms" )
82
84
FOREACH (QTP cocoa;minimal;offscreen)
83
85
IF (NOT EXISTS "${QPLUGDIR} /../platforms/libq${QTP} .dylib" )
84
86
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QT_PLUGINS_DIR@/platforms/libq${QTP} .dylib" "${QPLUGDIR} /../platforms/libq${QTP} .dylib" )
87
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QPLUGDIR} /../platforms/libq${QTP} .dylib" )
85
88
ENDIF ()
86
89
ENDFOREACH (QTP)
87
90
EXECUTE_PROCESS (COMMAND mkdir -p "${QPLUGDIR} /../sqldrivers" )
@@ -91,11 +94,13 @@ IF (@WITH_QSPATIALITE@)
91
94
LIST (APPEND QTLISTSQL spatialite)
92
95
IF (EXISTS "${QPLUGDIR} /../sqldrivers/libqsqlspatialite.dylib" )
93
96
EXECUTE_PROCESS (COMMAND ${CMAKE_COMMAND} -E remove "${QPLUGDIR} /../sqldrivers/libqsqlspatialite.dylib" )
97
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QPLUGDIR} /../sqldrivers/libqsqlspatialite.dylib" )
94
98
ENDIF ()
95
99
ENDIF ()
96
100
FOREACH (QSL ${QTLISTSQL} )
97
101
IF (NOT EXISTS "${QPLUGDIR} /../sqldrivers/libqsql${QSL} .dylib" AND EXISTS "@QT_PLUGINS_DIR@/sqldrivers/libqsql${QSL} .dylib" )
98
102
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QT_PLUGINS_DIR@/sqldrivers/libqsql${QSL} .dylib" "${QPLUGDIR} /../sqldrivers/libqsql${QSL} .dylib" )
103
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QPLUGDIR} /../sqldrivers/libqsql${QSL} .dylib" )
99
104
ENDIF ()
100
105
ENDFOREACH (QSL)
101
106
IF (NOT @WITH_QSPATIALITE@ AND EXISTS "${QPLUGDIR} /../sqldrivers/libqsqlspatialite.dylib" )
@@ -104,10 +109,12 @@ ENDIF ()
104
109
EXECUTE_PROCESS (COMMAND mkdir -p "${QPLUGDIR} /../iconengines" )
105
110
IF (NOT EXISTS "${QPLUGDIR} /../iconengines/libqsvgicon.dylib" )
106
111
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QT_PLUGINS_DIR@/iconengines/libqsvgicon.dylib" "${QPLUGDIR} /../iconengines/libqsvgicon.dylib" )
112
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QPLUGDIR} /../iconengines/libqsvgicon.dylib" )
107
113
ENDIF ()
108
114
EXECUTE_PROCESS (COMMAND mkdir -p "${QPLUGDIR} /../styles" )
109
115
IF (NOT EXISTS "${QPLUGDIR} /../styles/libqmacstyle.dylib" )
110
116
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QT_PLUGINS_DIR@/styles/libqmacstyle.dylib" "${QPLUGDIR} /../styles/libqmacstyle.dylib" )
117
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QPLUGDIR} /../styles/libqmacstyle.dylib" )
111
118
ENDIF ()
112
119
113
120
# Qwt
@@ -119,6 +126,7 @@ IF (QWT_ISLIB)
119
126
MESSAGE (STATUS "Copying Qwt and updating library paths..." )
120
127
IF (NOT EXISTS "${QLIBDIR} /libqwt.dylib" )
121
128
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QWT_LIBRARY@" "${QLIBDIR} /libqwt.dylib" )
129
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QLIBDIR} /libqwt.dylib" )
122
130
ENDIF ()
123
131
GET_INSTALL_NAME ("@QWT_LIBRARY@" "libqwt" QWT_CHG)
124
132
IF (QWT_CHG)
@@ -130,6 +138,7 @@ ELSEIF (QWT_ISFW AND EXISTS "@QWT_LIBRARY@")
130
138
STRING (REGEX REPLACE "/qwt.framework.*" "" QWT_PARENT "@QWT_LIBRARY@" )
131
139
IF (NOT IS_DIRECTORY "${QFWDIR} /qwt.framework" )
132
140
COPY_FRAMEWORK("${QWT_PARENT} " "qwt" "${QFWDIR} " )
141
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QFWDIR} /qwt.framework/qwt" )
133
142
ENDIF ()
134
143
GET_INSTALL_NAME ("${QWT_PARENT} /qwt.framework/qwt" "qwt.framework" QWT_CHG)
135
144
IF (QWT_CHG)
@@ -149,6 +158,7 @@ IF (@WITH_DESKTOP@)
149
158
MESSAGE (STATUS "Copying QwtPolar and updating library paths..." )
150
159
IF (NOT EXISTS "${QLIBDIR} /libqwtpolar.dylib" )
151
160
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QWT_LIBRARY@" "${QLIBDIR} /libqwtpolar.dylib" )
161
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QLIBDIR} /libqwtpolar.dylib" )
152
162
ENDIF ()
153
163
GET_INSTALL_NAME ("@QWTPOLAR_LIBRARY@" "libqwtpolar" QWTP_CHG)
154
164
IF (QWTP_CHG)
@@ -169,6 +179,7 @@ IF (@WITH_DESKTOP@)
169
179
STRING (REGEX REPLACE "/qwtpolar.framework.*" "" QWTP_PARENT "@QWTPOLAR_LIBRARY@" )
170
180
IF (NOT IS_DIRECTORY "${QFWDIR} /qwtpolar.framework" )
171
181
COPY_FRAMEWORK("${QWTP_PARENT} " "qwtpolar" "${QFWDIR} " )
182
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QFWDIR} /qwtpolar.framework/qwtpolar" )
172
183
ENDIF ()
173
184
GET_INSTALL_NAME ("${QWTP_PARENT} /qwtpolar.framework/qwtpolar" "qwtpolar.framework" QWTP_CHG)
174
185
IF (QWTP_CHG)
@@ -197,6 +208,7 @@ IF (ISLIB)
197
208
SET (QCA_CHG_TO "${ATLOADER} /@QGIS_PLUGIN_SUBDIR_REV@/${QGIS_LIB_SUBDIR} /libqca.dylib" )
198
209
IF (NOT EXISTS "${QLIBDIR} /libqca.dylib" )
199
210
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QCA_LIBRARY@" "${QLIBDIR} /libqca.dylib" )
211
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QLIBDIR} /libqca.dylib" )
200
212
ENDIF ()
201
213
GET_INSTALL_NAME ("@QCA_LIBRARY@" "libqca" QCA_CHG)
202
214
IF (QCA_CHG)
@@ -220,6 +232,7 @@ ELSEIF (ISFW AND EXISTS "@QCA_LIBRARY@")
220
232
IF (NOT IS_DIRECTORY "${QFWDIR} /${_qca_libname} .framework" )
221
233
STRING (REGEX REPLACE "/${_qca_libname} .framework.*" "" QCA_PARENT "@QCA_LIBRARY@" )
222
234
COPY_FRAMEWORK("${QCA_PARENT} " "${_qca_libname} " "${QFWDIR} " )
235
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QFWDIR} /${_qca_libname} .framework/${_qca_libname} " )
223
236
ENDIF ()
224
237
GET_INSTALL_NAME ("${QCA_LIBRARY} " "${_qca_libname} " QCA_CHG)
225
238
IF (QCA_CHG)
@@ -234,6 +247,7 @@ MESSAGE (STATUS "Updating QCA plugins with QCA library path in ${QCA_PLUGIN_DIR}
234
247
SET (QCA_PLUGINS logger ossl softstore)
235
248
FOREACH (qca_plugin ${QCA_PLUGINS} )
236
249
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${QCA_PLUGIN_DIR} /crypto/libqca-${qca_plugin} .dylib" "${QPLUGDIR} /../crypto/" )
250
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QCA_PLUGIN_DIR} /crypto/libqca-${qca_plugin} .dylib" )
237
251
IF (QCA_CHG)
238
252
INSTALLNAMETOOL_CHANGE ("${QCA_CHG} " "${QCA_CHG_TO} " "${QPLUGDIR} /../crypto/libqca-${qca_plugin} .dylib" )
239
253
ENDIF ()
@@ -243,6 +257,7 @@ ENDFOREACH ()
243
257
# linked to qca and qgis_core frameworks (see also 2lib.cmake.in)
244
258
IF (@WITH_QSPATIALITE@ AND EXISTS "${QPLUGDIR} /../sqldrivers/libqsqlspatialite.dylib" )
245
259
# qca.framework
260
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QPLUGDIR} /../sqldrivers/libqsqlspatialite.dylib" )
246
261
INSTALLNAMETOOL_CHANGE ("${QCA_CHG} " "${QCA_CHG_TO} " "${QPLUGDIR} /../sqldrivers/libqsqlspatialite.dylib" )
247
262
# qgis_core.framework
248
263
GET_INSTALL_NAME ("@QGIS_OUTPUT_DIRECTORY@/lib/qgis_core.framework/qgis_core" qgis_core.framework QGCORE)
@@ -260,6 +275,7 @@ ENDIF ()
260
275
IF (QSCI_LIB)
261
276
MESSAGE (STATUS "Copying QScintilla2 library and updating library paths..." )
262
277
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QSCINTILLA_LIBRARY@" "${QLIBDIR} /${QSCI_LIB} .dylib" )
278
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QLIBDIR} /${QSCI_LIB} .dylib" )
263
279
GET_INSTALL_NAME ("@QSCINTILLA_LIBRARY@" "${QSCI_LIB} " QSCI_CHG)
264
280
IF (QSCI_CHG)
265
281
UPDATEQGISPATHS (${QSCI_CHG} ${QSCI_LIB} .dylib)
@@ -271,6 +287,7 @@ ENDIF ()
271
287
IF (@QTKEYCHAIN_LIBRARY@ MATCHES ".*libqt5keychain.dylib" )
272
288
MESSAGE (STATUS "Copying QtKeychain library and updating library paths..." )
273
289
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QTKEYCHAIN_LIBRARY@" "${QLIBDIR} /libqt5keychain.dylib" )
290
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QLIBDIR} /libqt5keychain.dylib" )
274
291
GET_INSTALL_NAME ("@QTKEYCHAIN_LIBRARY@" "libqt5keychain" QTKEY_CHG)
275
292
IF (QTKEY_CHG)
276
293
UPDATEQGISPATHS (${QTKEY_CHG} libqt5keychain.dylib)
@@ -294,8 +311,10 @@ IF (SIPMODDIR)
294
311
# MYMESSAGE ("ditto ${QARCHS} \"${SIPMODDIR}/sip.so\" \"${QGISPYDIR}/\"")
295
312
IF (${SIPMODDIR} MATCHES ".*PyQt5.*" )
296
313
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${SIPMODDIR} /sip.so" "${QGISPYDIR} /PyQt5/" )
314
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QGISPYDIR} /PyQt5/sip.so" )
297
315
ELSE ()
298
316
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${SIPMODDIR} /sip.so" "${QGISPYDIR} /" )
317
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QGISPYDIR} /sip.so" )
299
318
ENDIF ()
300
319
EXECUTE_PROCESS (COMMAND cp -fp "${SIPMODDIR} /sipconfig.py" "${QGISPYDIR} /" )
301
320
ENDIF ()
@@ -316,6 +335,7 @@ FOREACH (PQ ${PYQTLIST})
316
335
IF (NOT EXISTS "${QGISPYDIR} /${MODSUBPATH} " )
317
336
# MESSAGE (STATUS "ditto ${QARCHS} \"${PYQT5MOD}\" \"${QGISPYDIR}/${MODSUBPATH}\"")
318
337
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${MODDIR} /${MODSUBPATH} " "${QGISPYDIR} /${MODSUBPATH} " )
338
+ EXECUTE_PROCESS (COMMAND install_name_tool -delete_rpath "@QT_LIBRARY_DIR@" "${QGISPYDIR} /${MODSUBPATH} " )
319
339
IF (EXISTS "${MODDIR} /${MODPYI} " )
320
340
EXECUTE_PROCESS (COMMAND ditto "${MODDIR} /${MODPYI} " "${QGISPYDIR} /${MODPYI} " )
321
341
ENDIF ()
0 commit comments