From 1a22b14d6032b3e74004e3d092c68aa5b9b2cdce Mon Sep 17 00:00:00 2001 From: Larry Shaffer Date: Thu, 1 Oct 2015 17:12:54 -0600 Subject: [PATCH] Bundle only the QCA plugins that are used on Mac --- mac/cmake/1qt.cmake.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in index cf91f724211..2973a48bac0 100644 --- a/mac/cmake/1qt.cmake.in +++ b/mac/cmake/1qt.cmake.in @@ -197,11 +197,12 @@ ENDIF () EXECUTE_PROCESS (COMMAND mkdir -p "${QPLUGDIR}/../crypto") FIND_QCA_PLUGIN_DIR (1) MESSAGE (STATUS "Updating QCA plugins with QCA library path in ${QCA_PLUGIN_DIR} ...") -FILE (GLOB QCA_PLUGINS RELATIVE "${QCA_PLUGIN_DIR}/crypto" "${QCA_PLUGIN_DIR}/crypto/libqca*") +# don't copy over any unneeded plugins +SET(QCA_PLUGINS logger ossl softstore) FOREACH (qca_plugin ${QCA_PLUGINS}) - EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${QCA_PLUGIN_DIR}/crypto/${qca_plugin}" "${QPLUGDIR}/../crypto/") + EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${QCA_PLUGIN_DIR}/crypto/libqca-${qca_plugin}.dylib" "${QPLUGDIR}/../crypto/") IF (QCA_CHG) - INSTALLNAMETOOL_CHANGE ("${QCA_CHG}" "${QCA_CHG_TO}" "${QPLUGDIR}/../crypto/${qca_plugin}") + INSTALLNAMETOOL_CHANGE ("${QCA_CHG}" "${QCA_CHG_TO}" "${QPLUGDIR}/../crypto/libqca-${qca_plugin}.dylib") ENDIF () ENDFOREACH () @@ -396,7 +397,7 @@ FOREACH (QFW ${QTLISTQG}) ENDIF () # qca plugins FOREACH (qca_plugin ${QCA_PLUGINS}) - INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../crypto/${qca_plugin}") + INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../crypto/libqca-${qca_plugin}.dylib") ENDFOREACH () # osg qfont plugin IF (@HAVE_OSGEARTHQT@)