From 57c4ee746fc660ec4d8a29a76f3abb6c5dc6310a Mon Sep 17 00:00:00 2001 From: William Kyngesburye Date: Mon, 15 Aug 2011 21:35:38 -0500 Subject: [PATCH] make sure qwt lib path updated --- mac/cmake/1qt.cmake.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in index cba7b996409..9759ee36851 100644 --- a/mac/cmake/1qt.cmake.in +++ b/mac/cmake/1qt.cmake.in @@ -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)