Skip to content
Permalink
Browse files

fix build with SIP 4.19.11 (fixes #19332)

  • Loading branch information
jef-n committed Jul 4, 2018
1 parent aefcc55 commit a0b6dc2d0dc1eda466ad9caae7e4fdb70b9892d8
Showing with 9 additions and 1 deletion.
  1. +5 −1 cmake/FindSIP.py
  2. +4 −0 cmake/SIPMacros.cmake
@@ -39,4 +39,8 @@
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)
print("sip_mod_dir:%s" % sipcfg.sip_mod_dir)
if hasattr(sipcfg, "sip_mod_dir"):
print("sip_mod_dir:%s" % sipcfg.sip_mod_dir)
else:
# SIP 4.19.10+ has no sipcfg.sip_mod_dir
print("sip_mod_dir:%s" % sipcfg.sip_module_dir)
@@ -96,6 +96,10 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP CPP_FILES)
ADD_DEFINITIONS( /bigobj )
ENDIF(MSVC)

IF(NOT SIP_VERSION_NUM LESS 267018)
SET(_sip_x ${_sip_x} -n sip)
ENDIF(NOT SIP_VERSION_NUM LESS 267018)

SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip})
SET(SUPPRESS_SIP_WARNINGS FALSE CACHE BOOL "Hide SIP warnings")
MARK_AS_ADVANCED(SUPPRESS_SIP_WARNINGS)

0 comments on commit a0b6dc2

Please sign in to comment.
You can’t perform that action at this time.