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

FindSIP: use new sip_module_dir variable (#7370)

Browse Source 
* 0vars.cmake, FindSIP: Update to save new sip_module_dir variable
sip4 has changed sip_mod_dir to sip_module_dir.
Store the variable for later usage

* Use only new MODULE_DIR sip variable
This commit is contained in:
Gianfranco Costamagna 2018-07-06 13:34:29 +02:00 committed by Denis Rouzaud
parent 5c855b417f
commit 9f050629c8
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindSIP.cmake
View File

@ -41,7 +41,7 @@ ELSE(SIP_VERSION)
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})
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_mod_dir:([^\n]+).*$" "\\1" SIP_MOD_DIR ${sip_config}) STRING(REGEX REPLACE ".*\nsip_module_dir:([^\n]+).*$" "\\1" SIP_MODULE_DIR ${sip_config})
SET(SIP_FOUND TRUE) SET(SIP_FOUND TRUE)
ENDIF(sip_config) ENDIF(sip_config)

8
cmake/FindSIP.py
View File

@ -39,8 +39,8 @@ print("sip_version_str:%s" % sipcfg.sip_version_str)
print("sip_bin:%s" % sipcfg.sip_bin) print("sip_bin:%s" % sipcfg.sip_bin)
print("default_sip_dir:%s" % sipcfg.default_sip_dir) print("default_sip_dir:%s" % sipcfg.default_sip_dir)
print("sip_inc_dir:%s" % sipcfg.sip_inc_dir) print("sip_inc_dir:%s" % sipcfg.sip_inc_dir)
if hasattr(sipcfg, "sip_mod_dir"): # SIP 4.19.10+ has new sipcfg.sip_module_dir
print("sip_mod_dir:%s" % sipcfg.sip_mod_dir) if hasattr(sipcfg, "sip_module_dir"):
print("sip_module_dir:%s" % sipcfg.sip_module_dir)
else: else:
# SIP 4.19.10+ has no sipcfg.sip_mod_dir print("sip_module_dir:%s" % sipcfg.sip_mod_dir)
print("sip_mod_dir:%s" % sipcfg.sip_module_dir)

4
mac/cmake/0vars.cmake.in
View File

@ -64,8 +64,8 @@ LIST(APPEND PYTHON_MODULE_PATHS ${_pythonpath})
IF (EXISTS "@PYQT5_MOD_DIR@") IF (EXISTS "@PYQT5_MOD_DIR@")
LIST(APPEND PYTHON_MODULE_PATHS "@PYQT5_MOD_DIR@") LIST(APPEND PYTHON_MODULE_PATHS "@PYQT5_MOD_DIR@")
ENDIF () ENDIF ()
IF (EXISTS "@SIP_MOD_DIR@") IF (EXISTS "@SIP_MODULE_DIR@")
LIST(APPEND PYTHON_MODULE_PATHS "@SIP_MOD_DIR@") LIST(APPEND PYTHON_MODULE_PATHS "@SIP_MODULE_DIR@")
ENDIF () ENDIF ()
IF (EXISTS "@PYTHON_SITE_PACKAGES_SYS@") IF (EXISTS "@PYTHON_SITE_PACKAGES_SYS@")
LIST(APPEND PYTHON_MODULE_PATHS "@PYTHON_SITE_PACKAGES_SYS@") LIST(APPEND PYTHON_MODULE_PATHS "@PYTHON_SITE_PACKAGES_SYS@")