sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

better fix for detecting QWTPOLAR without DESKTOP

Browse Source
This commit is contained in:
Denis Rouzaud 2018-09-27 10:38:47 -04:00 committed by GitHub
parent 057aafe17a
commit 97c5ed0225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
mac/cmake/1qt.cmake.in
View File

@ -132,50 +132,52 @@ ENDIF (QWT_ISLIB)
# QwtPolar # QwtPolar
IF (WITH_DESKTOP AND @WITH_QWTPOLAR@ AND NOT @WITH_INTERNAL_QWTPOLAR@) IF (@WITH_DESKTOP@)
STRING (REGEX MATCH "\\.dylib$" ISLIB "@QWTPOLAR_LIBRARY@") IF (@WITH_QWTPOLAR@ AND NOT @WITH_INTERNAL_QWTPOLAR@)
STRING (REGEX MATCH "qwtpolar.framework" ISFW "@QWTPOLAR_LIBRARY@") STRING (REGEX MATCH "\\.dylib$" ISLIB "@QWTPOLAR_LIBRARY@")
IF (ISLIB) STRING (REGEX MATCH "qwtpolar.framework" ISFW "@QWTPOLAR_LIBRARY@")
# shared libraries IF (ISLIB)
MESSAGE (STATUS "Copying QwtPolar and updating library paths...") # shared libraries
IF (NOT EXISTS "${QLIBDIR}/libqwtpolar.dylib") MESSAGE (STATUS "Copying QwtPolar and updating library paths...")
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QWT_LIBRARY@" "${QLIBDIR}/libqwtpolar.dylib") IF (NOT EXISTS "${QLIBDIR}/libqwtpolar.dylib")
ENDIF () EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@QWT_LIBRARY@" "${QLIBDIR}/libqwtpolar.dylib")
GET_INSTALL_NAME ("@QWTPOLAR_LIBRARY@" "libqwtpolar" QWTP_CHG) ENDIF ()
IF (QWTP_CHG) GET_INSTALL_NAME ("@QWTPOLAR_LIBRARY@" "libqwtpolar" QWTP_CHG)
UPDATEQGISPATHS (${QWTP_CHG} libqwtpolar.dylib) IF (QWTP_CHG)
ENDIF (QWTP_CHG) UPDATEQGISPATHS (${QWTP_CHG} libqwtpolar.dylib)
# update qwt lib in qwtpolar ENDIF (QWTP_CHG)
IF (QWT_CHG) # update qwt lib in qwtpolar
IF (QWT_ISLIB) IF (QWT_CHG)
SET (QWT_CHG_TO "${ATLOADER}/libqwt.dylib") IF (QWT_ISLIB)
ElSE () SET (QWT_CHG_TO "${ATLOADER}/libqwt.dylib")
SET (QWT_CHG_TO "${ATLOADER}/${QGIS_LIB_SUBDIR_REV}/${QGIS_FW_SUBDIR}/qwt.framework/qwt") ElSE ()
ENDIF () SET (QWT_CHG_TO "${ATLOADER}/${QGIS_LIB_SUBDIR_REV}/${QGIS_FW_SUBDIR}/qwt.framework/qwt")
INSTALLNAMETOOL_CHANGE ("${QWT_CHG}" "${QWT_CHG_TO}" "${QLIBDIR}/libqwtpolar.dylib") ENDIF ()
ENDIF (QWT_CHG) INSTALLNAMETOOL_CHANGE ("${QWT_CHG}" "${QWT_CHG_TO}" "${QLIBDIR}/libqwtpolar.dylib")
ELSEIF (ISFW AND EXISTS "@QWTPOLAR_LIBRARY@") ENDIF (QWT_CHG)
# framework ELSEIF (ISFW AND EXISTS "@QWTPOLAR_LIBRARY@")
MESSAGE (STATUS "Copying QwtPolar framework and updating library paths...") # framework
STRING(REGEX REPLACE "/qwtpolar.framework.*" "" QWTP_PARENT "@QWTPOLAR_LIBRARY@") MESSAGE (STATUS "Copying QwtPolar framework and updating library paths...")
IF (NOT IS_DIRECTORY "${QFWDIR}/qwtpolar.framework") STRING(REGEX REPLACE "/qwtpolar.framework.*" "" QWTP_PARENT "@QWTPOLAR_LIBRARY@")
COPY_FRAMEWORK("${QWTP_PARENT}" "qwtpolar" "${QFWDIR}") IF (NOT IS_DIRECTORY "${QFWDIR}/qwtpolar.framework")
ENDIF () COPY_FRAMEWORK("${QWTP_PARENT}" "qwtpolar" "${QFWDIR}")
GET_INSTALL_NAME ("${QWTP_PARENT}/qwtpolar.framework/qwtpolar" "qwtpolar.framework" QWTP_CHG) ENDIF ()
IF (QWTP_CHG) GET_INSTALL_NAME ("${QWTP_PARENT}/qwtpolar.framework/qwtpolar" "qwtpolar.framework" QWTP_CHG)
UPDATEQGISPATHS (${QWTP_CHG} qwtpolar) IF (QWTP_CHG)
ENDIF (QWTP_CHG) UPDATEQGISPATHS (${QWTP_CHG} qwtpolar)
# update qwt lib in qwtpolar ENDIF (QWTP_CHG)
IF (QWT_CHG) # update qwt lib in qwtpolar
IF (QWT_ISLIB) IF (QWT_CHG)
SET (QWT_CHG_TO "${ATLOADER}/../../../${QGIS_FW_SUBDIR_REV}/${QGIS_LIB_SUBDIR}/libqwt.dylib") IF (QWT_ISLIB)
ElSE () SET (QWT_CHG_TO "${ATLOADER}/../../../${QGIS_FW_SUBDIR_REV}/${QGIS_LIB_SUBDIR}/libqwt.dylib")
SET (QWT_CHG_TO "${ATLOADER}/../../../qwt.framework/qwt") ElSE ()
ENDIF () SET (QWT_CHG_TO "${ATLOADER}/../../../qwt.framework/qwt")
INSTALLNAMETOOL_CHANGE ("${QWT_CHG}" "${QWT_CHG_TO}" "${QFWDIR}/qwtpolar.framework/qwtpolar") ENDIF ()
ENDIF (QWT_CHG) INSTALLNAMETOOL_CHANGE ("${QWT_CHG}" "${QWT_CHG_TO}" "${QFWDIR}/qwtpolar.framework/qwtpolar")
ENDIF (ISLIB) ENDIF (QWT_CHG)
ENDIF (WITH_DESKTOP AND @WITH_QWTPOLAR@ AND NOT @WITH_INTERNAL_QWTPOLAR@) ENDIF (ISLIB)
ENDIF (@WITH_QWTPOLAR@ AND NOT @WITH_INTERNAL_QWTPOLAR@)
ENDIF (@WITH_DESKTOP@)
# QCA # QCA