[QGIS Commit] r14613 - trunk/qgis/mac/cmake
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Nov 13 13:06:19 EST 2010
Author: kyngchaos
Date: 2010-11-13 10:06:19 -0800 (Sat, 13 Nov 2010)
New Revision: 14613
Modified:
trunk/qgis/mac/cmake/0qgis.cmake.in
trunk/qgis/mac/cmake/1qt.cmake.in
Log:
executable_path for pyqt bin
Modified: trunk/qgis/mac/cmake/0qgis.cmake.in
===================================================================
--- trunk/qgis/mac/cmake/0qgis.cmake.in 2010-11-13 17:56:09 UTC (rev 14612)
+++ trunk/qgis/mac/cmake/0qgis.cmake.in 2010-11-13 18:06:19 UTC (rev 14613)
@@ -34,27 +34,27 @@
# 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@)
Modified: trunk/qgis/mac/cmake/1qt.cmake.in
===================================================================
--- trunk/qgis/mac/cmake/1qt.cmake.in 2010-11-13 17:56:09 UTC (rev 14612)
+++ trunk/qgis/mac/cmake/1qt.cmake.in 2010-11-13 18:06:19 UTC (rev 14613)
@@ -270,13 +270,6 @@
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}")
@@ -284,4 +277,9 @@
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)
More information about the QGIS-commit
mailing list