File tree 3 files changed +4
-2
lines changed
3 files changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -36,6 +36,7 @@ ELSE(SIP_VERSION)
36
36
EXECUTE_PROCESS (COMMAND ${PYTHON_EXECUTABLE} ${_find_sip_py} OUTPUT_VARIABLE sip_config)
37
37
IF (sip_config)
38
38
STRING (REGEX REPLACE "^sip_version:([^\n ]+).*$" "\\ 1" SIP_VERSION ${sip_config} )
39
+ STRING (REGEX REPLACE ".*\n sip_version_num:([^\n ]+).*$" "\\ 1" SIP_VERSION_NUM ${sip_config} )
39
40
STRING (REGEX REPLACE ".*\n sip_version_str:([^\n ]+).*$" "\\ 1" SIP_VERSION_STR ${sip_config} )
40
41
STRING (REGEX REPLACE ".*\n sip_bin:([^\n ]+).*$" "\\ 1" SIP_BINARY_PATH ${sip_config} )
41
42
STRING (REGEX REPLACE ".*\n default_sip_dir:([^\n ]+).*$" "\\ 1" SIP_DEFAULT_SIP_DIR ${sip_config} )
Original file line number Diff line number Diff line change 9
9
10
10
sipcfg = sipconfig .Configuration ()
11
11
print ("sip_version:%06.0x" % sipcfg .sip_version )
12
+ print ("sip_version_num:%d" % sipcfg .sip_version )
12
13
print ("sip_version_str:%s" % sipcfg .sip_version_str )
13
14
print ("sip_bin:%s" % sipcfg .sip_bin )
14
15
print ("default_sip_dir:%s" % sipcfg .default_sip_dir )
Original file line number Diff line number Diff line change @@ -39,9 +39,9 @@ IF(PYQT4_VERSION_NUM LESS 263680) # 0x040600
39
39
SET (SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
40
40
ENDIF (PYQT4_VERSION_NUM LESS 263680)
41
41
42
- IF (NOT PYQT4_VERSION_NUM LESS 266496) # 0x041100
42
+ IF (NOT SIP_VERSION_NUM LESS 266496) # 0x041100
43
43
SET (SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
44
- ENDIF (NOT PYQT4_VERSION_NUM LESS 266496)
44
+ ENDIF (NOT SIP_VERSION_NUM LESS 266496)
45
45
46
46
# core module
47
47
FILE (GLOB sip_files_core core/*.sip)
You can’t perform that action at this time.
0 commit comments