executable_path for pyqt bin

git-svn-id: http://svn.osgeo.org/qgis/trunk@14613 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
kyngchaos 2010-11-13 18:06:19 +00:00
parent 8279b54778
commit b75f392578
2 changed files with 19 additions and 21 deletions

View File

@ -270,13 +270,6 @@ 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}")
@ -284,4 +277,9 @@ FOREACH (QFW ${QTLISTQG})
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)