Skip to content

Commit 97c5ed0

Browse files
authoredSep 27, 2018
better fix for detecting QWTPOLAR without DESKTOP
1 parent 057aafe commit 97c5ed0

File tree

1 file changed

+46
-44
lines changed

1 file changed

+46
-44
lines changed
 

‎mac/cmake/1qt.cmake.in

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -132,50 +132,52 @@ ENDIF (QWT_ISLIB)
132132

133133
# QwtPolar
134134

135-
IF (WITH_DESKTOP AND @WITH_QWTPOLAR@ AND NOT @WITH_INTERNAL_QWTPOLAR@)
136-
STRING (REGEX MATCH "\\.dylib$" ISLIB "@QWTPOLAR_LIBRARY@")
137-
STRING (REGEX MATCH "qwtpolar.framework" ISFW "@QWTPOLAR_LIBRARY@")
138-
IF (ISLIB)
139-
# shared libraries
140-
MESSAGE (STATUS "Copying QwtPolar and updating library paths...")
141-
IF (NOT EXISTS "${QLIBDIR}/libqwtpolar.dylib")
142-
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QWT_LIBRARY@" "${QLIBDIR}/libqwtpolar.dylib")
143-
ENDIF ()
144-
GET_INSTALL_NAME ("@QWTPOLAR_LIBRARY@" "libqwtpolar" QWTP_CHG)
145-
IF (QWTP_CHG)
146-
UPDATEQGISPATHS (${QWTP_CHG} libqwtpolar.dylib)
147-
ENDIF (QWTP_CHG)
148-
# update qwt lib in qwtpolar
149-
IF (QWT_CHG)
150-
IF (QWT_ISLIB)
151-
SET (QWT_CHG_TO "${ATLOADER}/libqwt.dylib")
152-
ElSE ()
153-
SET (QWT_CHG_TO "${ATLOADER}/${QGIS_LIB_SUBDIR_REV}/${QGIS_FW_SUBDIR}/qwt.framework/qwt")
154-
ENDIF ()
155-
INSTALLNAMETOOL_CHANGE ("${QWT_CHG}" "${QWT_CHG_TO}" "${QLIBDIR}/libqwtpolar.dylib")
156-
ENDIF (QWT_CHG)
157-
ELSEIF (ISFW AND EXISTS "@QWTPOLAR_LIBRARY@")
158-
# framework
159-
MESSAGE (STATUS "Copying QwtPolar framework and updating library paths...")
160-
STRING(REGEX REPLACE "/qwtpolar.framework.*" "" QWTP_PARENT "@QWTPOLAR_LIBRARY@")
161-
IF (NOT IS_DIRECTORY "${QFWDIR}/qwtpolar.framework")
162-
COPY_FRAMEWORK("${QWTP_PARENT}" "qwtpolar" "${QFWDIR}")
163-
ENDIF ()
164-
GET_INSTALL_NAME ("${QWTP_PARENT}/qwtpolar.framework/qwtpolar" "qwtpolar.framework" QWTP_CHG)
165-
IF (QWTP_CHG)
166-
UPDATEQGISPATHS (${QWTP_CHG} qwtpolar)
167-
ENDIF (QWTP_CHG)
168-
# update qwt lib in qwtpolar
169-
IF (QWT_CHG)
170-
IF (QWT_ISLIB)
171-
SET (QWT_CHG_TO "${ATLOADER}/../../../${QGIS_FW_SUBDIR_REV}/${QGIS_LIB_SUBDIR}/libqwt.dylib")
172-
ElSE ()
173-
SET (QWT_CHG_TO "${ATLOADER}/../../../qwt.framework/qwt")
174-
ENDIF ()
175-
INSTALLNAMETOOL_CHANGE ("${QWT_CHG}" "${QWT_CHG_TO}" "${QFWDIR}/qwtpolar.framework/qwtpolar")
176-
ENDIF (QWT_CHG)
177-
ENDIF (ISLIB)
178-
ENDIF (WITH_DESKTOP AND @WITH_QWTPOLAR@ AND NOT @WITH_INTERNAL_QWTPOLAR@)
135+
IF (@WITH_DESKTOP@)
136+
IF (@WITH_QWTPOLAR@ AND NOT @WITH_INTERNAL_QWTPOLAR@)
137+
STRING (REGEX MATCH "\\.dylib$" ISLIB "@QWTPOLAR_LIBRARY@")
138+
STRING (REGEX MATCH "qwtpolar.framework" ISFW "@QWTPOLAR_LIBRARY@")
139+
IF (ISLIB)
140+
# shared libraries
141+
MESSAGE (STATUS "Copying QwtPolar and updating library paths...")
142+
IF (NOT EXISTS "${QLIBDIR}/libqwtpolar.dylib")
143+
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QWT_LIBRARY@" "${QLIBDIR}/libqwtpolar.dylib")
144+
ENDIF ()
145+
GET_INSTALL_NAME ("@QWTPOLAR_LIBRARY@" "libqwtpolar" QWTP_CHG)
146+
IF (QWTP_CHG)
147+
UPDATEQGISPATHS (${QWTP_CHG} libqwtpolar.dylib)
148+
ENDIF (QWTP_CHG)
149+
# update qwt lib in qwtpolar
150+
IF (QWT_CHG)
151+
IF (QWT_ISLIB)
152+
SET (QWT_CHG_TO "${ATLOADER}/libqwt.dylib")
153+
ElSE ()
154+
SET (QWT_CHG_TO "${ATLOADER}/${QGIS_LIB_SUBDIR_REV}/${QGIS_FW_SUBDIR}/qwt.framework/qwt")
155+
ENDIF ()
156+
INSTALLNAMETOOL_CHANGE ("${QWT_CHG}" "${QWT_CHG_TO}" "${QLIBDIR}/libqwtpolar.dylib")
157+
ENDIF (QWT_CHG)
158+
ELSEIF (ISFW AND EXISTS "@QWTPOLAR_LIBRARY@")
159+
# framework
160+
MESSAGE (STATUS "Copying QwtPolar framework and updating library paths...")
161+
STRING(REGEX REPLACE "/qwtpolar.framework.*" "" QWTP_PARENT "@QWTPOLAR_LIBRARY@")
162+
IF (NOT IS_DIRECTORY "${QFWDIR}/qwtpolar.framework")
163+
COPY_FRAMEWORK("${QWTP_PARENT}" "qwtpolar" "${QFWDIR}")
164+
ENDIF ()
165+
GET_INSTALL_NAME ("${QWTP_PARENT}/qwtpolar.framework/qwtpolar" "qwtpolar.framework" QWTP_CHG)
166+
IF (QWTP_CHG)
167+
UPDATEQGISPATHS (${QWTP_CHG} qwtpolar)
168+
ENDIF (QWTP_CHG)
169+
# update qwt lib in qwtpolar
170+
IF (QWT_CHG)
171+
IF (QWT_ISLIB)
172+
SET (QWT_CHG_TO "${ATLOADER}/../../../${QGIS_FW_SUBDIR_REV}/${QGIS_LIB_SUBDIR}/libqwt.dylib")
173+
ElSE ()
174+
SET (QWT_CHG_TO "${ATLOADER}/../../../qwt.framework/qwt")
175+
ENDIF ()
176+
INSTALLNAMETOOL_CHANGE ("${QWT_CHG}" "${QWT_CHG_TO}" "${QFWDIR}/qwtpolar.framework/qwtpolar")
177+
ENDIF (QWT_CHG)
178+
ENDIF (ISLIB)
179+
ENDIF (@WITH_QWTPOLAR@ AND NOT @WITH_INTERNAL_QWTPOLAR@)
180+
ENDIF (@WITH_DESKTOP@)
179181

180182
# QCA
181183

0 commit comments

Comments
 (0)
Please sign in to comment.