sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-29 00:06:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use SIP_INCLUDE_DIR and SIP_MODULE_DIR only with SIP v4

Browse Source
This commit is contained in:
Dmitry Shachnev 2020-07-15 20:00:49 +03:00
parent 33b58dd7e8
commit d0c4e0de9d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindSIP.cmake
View File

@ -40,8 +40,10 @@ ELSE(SIP_VERSION)
STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config}) STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config})
STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config}) STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config})
STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config}) STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config})
IF(${SIP_VERSION_STR} VERSION_LESS 5)
STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config}) STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config})
STRING(REGEX REPLACE ".*\nsip_module_dir:([^\n]+).*$" "\\1" SIP_MODULE_DIR ${sip_config}) STRING(REGEX REPLACE ".*\nsip_module_dir:([^\n]+).*$" "\\1" SIP_MODULE_DIR ${sip_config})
ENDIF(${SIP_VERSION_STR} VERSION_LESS 5)
SET(SIP_FOUND TRUE) SET(SIP_FOUND TRUE)
ENDIF(sip_config) ENDIF(sip_config)

6
python/CMakeLists.txt
View File

@ -85,6 +85,12 @@ INCLUDE_DIRECTORIES(SYSTEM
${SPATIALINDEX_INCLUDE_DIR} ${SPATIALINDEX_INCLUDE_DIR}
) )
IF (${SIP_VERSION_STR} VERSION_LESS 5)
INCLUDE_DIRECTORIES(SYSTEM
${SIP_INCLUDE_DIR}
)
ENDIF (${SIP_VERSION_STR} VERSION_LESS 5)
IF (WITH_GUI) IF (WITH_GUI)
INCLUDE_DIRECTORIES(SYSTEM INCLUDE_DIRECTORIES(SYSTEM
${QSCINTILLA_INCLUDE_DIR} ${QSCINTILLA_INCLUDE_DIR}