Skip to content
Permalink
Browse files

Fix macOS bundling of server service libraries

  • Loading branch information
dakcarto committed Feb 7, 2017
1 parent 835ffb0 commit 4f7caa027f75067a50302e6f0b89936522d2f84b
Showing with 2 additions and 2 deletions.
  1. +2 −2 cmake/MacBundleMacros.cmake
@@ -107,7 +107,7 @@ ENDFUNCTION (COPY_FRAMEWORK)

FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
IF (LIBFROM)
STRING (REGEX MATCH "\\.dylib$" ISLIB "${LIBTO}")
STRING (REGEX MATCH "\\.(dylib|so)$" ISLIB "${LIBTO}")
IF (ISLIB)
SET (LIBPOST "${LIBTO}")
SET (LIBMID "${QGIS_LIB_SUBDIR}")
@@ -228,7 +228,7 @@ FILE (GLOB QGFWLIST RELATIVE "${QFWDIR}" "${QFWDIR}/qgis*.framework")
STRING(REPLACE ".framework" ";" QGFWLIST ${QGFWLIST})
# don't collect any library symlinks, limit to versioned libs
SET (Q_LIBVER ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
FILE (GLOB QGLIBLIST RELATIVE "${QLIBDIR}" "${QLIBDIR}/libqgis*.dylib")
FILE (GLOB QGLIBLIST RELATIVE "${QLIBDIR}" "${QLIBDIR}/libqgis*.dylib" "${QLIBDIR}/qgis/server/lib*.so")
FILE (GLOB QGPLUGLIST "${QPLUGDIR}/*.so")
FILE (GLOB QGPYLIST "${QGISPYDIR}/qgis/*.so")
FILE (GLOB QGAPPLIST RELATIVE "${QBINDIR}" "${QBINDIR}/q*.app")

0 comments on commit 4f7caa0

Please sign in to comment.
You can’t perform that action at this time.