Skip to content

Commit 57c4ee7

Browse files
committedAug 16, 2011
make sure qwt lib path updated
1 parent 939f65c commit 57c4ee7

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed
 

‎mac/cmake/1qt.cmake.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ MESSAGE (STATUS "Copying Qwt and updating library paths...")
9797
IF (NOT EXISTS "${QLIBDIR}/libqwt.dylib")
9898
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QWT_LIBRARY@" "${QLIBDIR}/libqwt.dylib")
9999
ENDIF ()
100-
GET_INSTALL_NAME ("@QWT_LIBRARY@" "libqwt" QLIB)
101-
IF (QLIB)
102-
INSTALLNAMETOOL_CHANGE ("${QLIB}" "${ATEXECUTABLE}/@QGIS_LIB_SUBDIR@/libqwt.dylib" "${QAPPDIR}/@QGIS_APP_NAME@")
103-
ENDIF (QLIB)
100+
GET_INSTALL_NAME ("@QWT_LIBRARY@" "libqwt" QWT_CHG)
101+
IF (QWT_CHG)
102+
INSTALLNAMETOOL_CHANGE ("${QWT_CHG}" "${ATEXECUTABLE}/@QGIS_LIB_SUBDIR@/libqwt.dylib" "${QAPPDIR}/@QGIS_APP_NAME@")
103+
ENDIF (QWT_CHG)
104104

105105
# PyQt
106106

@@ -153,9 +153,9 @@ FOREACH (PQWPY ${PQWPYLIST})
153153
EXECUTE_PROCESS (COMMAND cp -fp "${PQWPY}" "${QGISPYDIR}/PyQt${QT_FWVER}/Qwt5/")
154154
ENDFOREACH (PQWPY)
155155
IF (QWT_CHG)
156-
IF (@OSX_HAVE_LOADERPATH@ AND QWT_CHG)
156+
IF (@OSX_HAVE_LOADERPATH@)
157157
SET (QWT_CHG_TO "${ATLOADER}/../../../@QGIS_DATA_SUBDIR_REV@/@QGIS_LIB_SUBDIR@/libqwt.dylib")
158-
ENDIF (@OSX_HAVE_LOADERPATH@ AND QWT_CHG)
158+
ENDIF (@OSX_HAVE_LOADERPATH@)
159159
FOREACH (PW _iqt;Qwt)
160160
INSTALLNAMETOOL_CHANGE (${QWT_CHG} ${QWT_CHG_TO} "${QGISPYDIR}/PyQt${QT_FWVER}/Qwt5/${PW}.so")
161161
ENDFOREACH (PW)

0 commit comments

Comments
 (0)
Please sign in to comment.