Skip to content
Permalink
Browse files

executable_path for pyqt bin

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14613 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
kyngchaos
kyngchaos committed Nov 13, 2010
1 parent ad5362e commit a40cedeffe090ac4b90a38bd732f291253c7c320
Showing with 19 additions and 21 deletions.
  1. +14 −14 mac/cmake/0qgis.cmake.in
  2. +5 −7 mac/cmake/1qt.cmake.in
@@ -34,27 +34,27 @@ FILE (GLOB QGPYLIST ${QGISPYDIR}/qgis/*.so)
# leave main qgis executable and qgis_help with executable_paths

IF (@OSX_HAVE_LOADERPATH@)
MESSAGE (STATUS "Updating QGIS library paths...")
# inter-library links - do all combos, many will be noops
MESSAGE (STATUS "Updating QGIS library paths...")
# inter-library links - do all combos, many will be noops
FOREACH (QL ${QGLIBLIST})
FOREACH (QLL ${QGLIBLIST})
INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QLL} ${ATLOADER}/${QLL} "${QLIBDIR}/${QL}")
ENDFOREACH (QLL)
FOREACH (QLL ${QGLIBLIST})
INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QLL} ${ATLOADER}/${QLL} "${QLIBDIR}/${QL}")
ENDFOREACH (QLL)
ENDFOREACH (QL)
# plugins
FOREACH (QP ${QGPLUGLIST})
FOREACH (QLL ${QGLIBLIST})
INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QLL} ${ATLOADER}/@QGIS_PLUGIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${QLL} "${QP}")
ENDFOREACH (QLL)
FOREACH (QLL ${QGLIBLIST})
INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QLL} ${ATLOADER}/@QGIS_PLUGIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${QLL} "${QP}")
ENDFOREACH (QLL)
ENDFOREACH (QP)
# qgis python
FOREACH (PG ${QGPYLIST})
FOREACH (QLL ${QGLIBLIST})
INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QLL} ${ATLOADER}/../../@QGIS_DATA_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${QLL} "${PG}")
ENDFOREACH (QLL)
FOREACH (QLL ${QGLIBLIST})
INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QLL} ${ATLOADER}/../../@QGIS_DATA_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${QLL} "${PG}")
ENDFOREACH (QLL)
ENDFOREACH (PG)
# qgis-mapserver
FOREACH (QLL ${QGLIBLIST})
INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QLL} ${ATEXECUTABLE}/@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${QLL} "${QCGIDIR}/qgis_mapserv.fcgi")
ENDFOREACH (QLL)
FOREACH (QLL ${QGLIBLIST})
INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QLL} ${ATEXECUTABLE}/@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/${QLL} "${QCGIDIR}/qgis_mapserv.fcgi")
ENDFOREACH (QLL)
ENDIF (@OSX_HAVE_LOADERPATH@)
@@ -270,18 +270,16 @@ FOREACH (QFW ${QTLISTQG})
FOREACH (PG ${QGPYLIST})
INSTALLNAMETOOL_CHANGE (${QFW_CHG} ${QFW_CHG_TO} "${PG}")
ENDFOREACH (PG)
# bin - PyQt utils
IF (@OSX_HAVE_LOADERPATH@)
SET (QFW_CHG_TO "${ATLOADER}/@QGIS_BIN_SUBDIR_REV@/@QGIS_FW_SUBDIR@/${QFW}.framework/${QFW}")
ENDIF (@OSX_HAVE_LOADERPATH@)
FOREACH (PB pylupdate4;pyrcc4)
INSTALLNAMETOOL_CHANGE (${QFW_CHG} ${QFW_CHG_TO} "${QBINDIR}/${PB}")
ENDFOREACH (PB)
# PyQwt
IF (@OSX_HAVE_LOADERPATH@)
SET (QFW_CHG_TO "${ATLOADER}/../../../@QGIS_DATA_SUBDIR_REV@/@QGIS_FW_SUBDIR@/${QFW}.framework/${QFW}")
ENDIF (@OSX_HAVE_LOADERPATH@)
FOREACH (PW _iqt;Qwt)
INSTALLNAMETOOL_CHANGE (${QFW_CHG} ${QFW_CHG_TO} "${QGISPYDIR}/PyQt${QT_FWVER}/Qwt5/${PW}.so")
ENDFOREACH (PW)
# bin - PyQt utils
SET (QFW_CHG_TO "${ATEXECUTABLE}/@QGIS_BIN_SUBDIR_REV@/@QGIS_FW_SUBDIR@/${QFW}.framework/${QFW}")
FOREACH (PB pylupdate4;pyrcc4)
INSTALLNAMETOOL_CHANGE (${QFW_CHG} ${QFW_CHG_TO} "${QBINDIR}/${PB}")
ENDFOREACH (PB)
ENDFOREACH (QFW)

0 comments on commit a40cede

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