diff --git a/cmake/FindSIP.cmake b/cmake/FindSIP.cmake index 744cb25ff98..3a2aaff8c19 100644 --- a/cmake/FindSIP.cmake +++ b/cmake/FindSIP.cmake @@ -41,7 +41,7 @@ ELSE(SIP_VERSION) 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 ".*\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) ENDIF(sip_config) diff --git a/cmake/FindSIP.py b/cmake/FindSIP.py index 7bdf14a6186..dd4b71cb93d 100644 --- a/cmake/FindSIP.py +++ b/cmake/FindSIP.py @@ -39,8 +39,8 @@ print("sip_version_str:%s" % sipcfg.sip_version_str) print("sip_bin:%s" % sipcfg.sip_bin) print("default_sip_dir:%s" % sipcfg.default_sip_dir) print("sip_inc_dir:%s" % sipcfg.sip_inc_dir) -if hasattr(sipcfg, "sip_mod_dir"): - print("sip_mod_dir:%s" % sipcfg.sip_mod_dir) +# SIP 4.19.10+ has new sipcfg.sip_module_dir +if hasattr(sipcfg, "sip_module_dir"): + print("sip_module_dir:%s" % sipcfg.sip_module_dir) else: - # SIP 4.19.10+ has no sipcfg.sip_mod_dir - print("sip_mod_dir:%s" % sipcfg.sip_module_dir) + print("sip_module_dir:%s" % sipcfg.sip_mod_dir) diff --git a/mac/cmake/0vars.cmake.in b/mac/cmake/0vars.cmake.in index d374fd7dcd8..bce03c49c4d 100644 --- a/mac/cmake/0vars.cmake.in +++ b/mac/cmake/0vars.cmake.in @@ -64,8 +64,8 @@ LIST(APPEND PYTHON_MODULE_PATHS ${_pythonpath}) IF (EXISTS "@PYQT5_MOD_DIR@") LIST(APPEND PYTHON_MODULE_PATHS "@PYQT5_MOD_DIR@") ENDIF () -IF (EXISTS "@SIP_MOD_DIR@") - LIST(APPEND PYTHON_MODULE_PATHS "@SIP_MOD_DIR@") +IF (EXISTS "@SIP_MODULE_DIR@") + LIST(APPEND PYTHON_MODULE_PATHS "@SIP_MODULE_DIR@") ENDIF () IF (EXISTS "@PYTHON_SITE_PACKAGES_SYS@") LIST(APPEND PYTHON_MODULE_PATHS "@PYTHON_SITE_PACKAGES_SYS@")