mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-13 00:03:09 -04:00
make sure qwt lib path updated
This commit is contained in:
parent
939f65cc1c
commit
57c4ee746f
@ -97,10 +97,10 @@ MESSAGE (STATUS "Copying Qwt and updating library paths...")
|
||||
IF (NOT EXISTS "${QLIBDIR}/libqwt.dylib")
|
||||
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QWT_LIBRARY@" "${QLIBDIR}/libqwt.dylib")
|
||||
ENDIF ()
|
||||
GET_INSTALL_NAME ("@QWT_LIBRARY@" "libqwt" QLIB)
|
||||
IF (QLIB)
|
||||
INSTALLNAMETOOL_CHANGE ("${QLIB}" "${ATEXECUTABLE}/@QGIS_LIB_SUBDIR@/libqwt.dylib" "${QAPPDIR}/@QGIS_APP_NAME@")
|
||||
ENDIF (QLIB)
|
||||
GET_INSTALL_NAME ("@QWT_LIBRARY@" "libqwt" QWT_CHG)
|
||||
IF (QWT_CHG)
|
||||
INSTALLNAMETOOL_CHANGE ("${QWT_CHG}" "${ATEXECUTABLE}/@QGIS_LIB_SUBDIR@/libqwt.dylib" "${QAPPDIR}/@QGIS_APP_NAME@")
|
||||
ENDIF (QWT_CHG)
|
||||
|
||||
# PyQt
|
||||
|
||||
@ -153,9 +153,9 @@ FOREACH (PQWPY ${PQWPYLIST})
|
||||
EXECUTE_PROCESS (COMMAND cp -fp "${PQWPY}" "${QGISPYDIR}/PyQt${QT_FWVER}/Qwt5/")
|
||||
ENDFOREACH (PQWPY)
|
||||
IF (QWT_CHG)
|
||||
IF (@OSX_HAVE_LOADERPATH@ AND QWT_CHG)
|
||||
IF (@OSX_HAVE_LOADERPATH@)
|
||||
SET (QWT_CHG_TO "${ATLOADER}/../../../@QGIS_DATA_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/libqwt.dylib")
|
||||
ENDIF (@OSX_HAVE_LOADERPATH@ AND QWT_CHG)
|
||||
ENDIF (@OSX_HAVE_LOADERPATH@)
|
||||
FOREACH (PW _iqt;Qwt)
|
||||
INSTALLNAMETOOL_CHANGE (${QWT_CHG} ${QWT_CHG_TO} "${QGISPYDIR}/PyQt${QT_FWVER}/Qwt5/${PW}.so")
|
||||
ENDFOREACH (PW)
|
||||
|
Loading…
x
Reference in New Issue
Block a user