Skip to content

Commit 7172f01

Browse files
author
jef
committed
fix for #2985 (take II)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14324 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 69cf6c9 commit 7172f01

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

cmake/FindSIP.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ ELSE(SIP_VERSION)
3636
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_sip_py} OUTPUT_VARIABLE sip_config)
3737
IF(sip_config)
3838
STRING(REGEX REPLACE "^sip_version:([^\n]+).*$" "\\1" SIP_VERSION ${sip_config})
39+
STRING(REGEX REPLACE ".*\nsip_version_num:([^\n]+).*$" "\\1" SIP_VERSION_NUM ${sip_config})
3940
STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config})
4041
STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config})
4142
STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config})

cmake/FindSIP.py

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
sipcfg = sipconfig.Configuration()
1111
print("sip_version:%06.0x" % sipcfg.sip_version)
12+
print("sip_version_num:%d" % sipcfg.sip_version)
1213
print("sip_version_str:%s" % sipcfg.sip_version_str)
1314
print("sip_bin:%s" % sipcfg.sip_bin)
1415
print("default_sip_dir:%s" % sipcfg.default_sip_dir)

python/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ IF(PYQT4_VERSION_NUM LESS 263680) # 0x040600
3939
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
4040
ENDIF(PYQT4_VERSION_NUM LESS 263680)
4141

42-
IF(NOT PYQT4_VERSION_NUM LESS 266496) # 0x041100
42+
IF(NOT SIP_VERSION_NUM LESS 266496) # 0x041100
4343
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)
4545

4646
# core module
4747
FILE(GLOB sip_files_core core/*.sip)

0 commit comments

Comments
 (0)