File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -197,11 +197,12 @@ ENDIF ()
197197EXECUTE_PROCESS (COMMAND mkdir -p "${QPLUGDIR} /../crypto" )
198198FIND_QCA_PLUGIN_DIR (1 )
199199MESSAGE (STATUS "Updating QCA plugins with QCA library path in ${QCA_PLUGIN_DIR} ..." )
200- FILE (GLOB QCA_PLUGINS RELATIVE "${QCA_PLUGIN_DIR} /crypto" "${QCA_PLUGIN_DIR} /crypto/libqca*" )
200+ # don't copy over any unneeded plugins
201+ SET (QCA_PLUGINS logger ossl softstore)
201202FOREACH (qca_plugin ${QCA_PLUGINS} )
202- EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${QCA_PLUGIN_DIR} /crypto/${qca_plugin} " "${QPLUGDIR} /../crypto/" )
203+ EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${QCA_PLUGIN_DIR} /crypto/libqca- ${qca_plugin} .dylib " "${QPLUGDIR} /../crypto/" )
203204 IF (QCA_CHG)
204- INSTALLNAMETOOL_CHANGE ("${QCA_CHG} " "${QCA_CHG_TO} " "${QPLUGDIR} /../crypto/${qca_plugin} " )
205+ INSTALLNAMETOOL_CHANGE ("${QCA_CHG} " "${QCA_CHG_TO} " "${QPLUGDIR} /../crypto/libqca- ${qca_plugin} .dylib " )
205206 ENDIF ()
206207ENDFOREACH ()
207208
@@ -396,7 +397,7 @@ FOREACH (QFW ${QTLISTQG})
396397 ENDIF ()
397398 # qca plugins
398399 FOREACH (qca_plugin ${QCA_PLUGINS} )
399- INSTALLNAMETOOL_CHANGE ("${QFW_CHG} " "${QFW_CHG_TO} " "${QPLUGDIR} /../crypto/${qca_plugin} " )
400+ INSTALLNAMETOOL_CHANGE ("${QFW_CHG} " "${QFW_CHG_TO} " "${QPLUGDIR} /../crypto/libqca- ${qca_plugin} .dylib " )
400401 ENDFOREACH ()
401402 # osg qfont plugin
402403 IF (@HAVE_OSGEARTHQT@)
You can’t perform that action at this time.
0 commit comments