Skip to content
Permalink
Browse files
fix for #2985 (take II)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14324 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Oct 3, 2010
1 parent 69cf6c9 commit 7172f01cc4423f6098b8aec51ca08c32b0c10465
Showing with 4 additions and 2 deletions.
  1. +1 −0 cmake/FindSIP.cmake
  2. +1 −0 cmake/FindSIP.py
  3. +2 −2 python/CMakeLists.txt
@@ -36,6 +36,7 @@ ELSE(SIP_VERSION)
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_sip_py} OUTPUT_VARIABLE sip_config)
IF(sip_config)
STRING(REGEX REPLACE "^sip_version:([^\n]+).*$" "\\1" SIP_VERSION ${sip_config})
STRING(REGEX REPLACE ".*\nsip_version_num:([^\n]+).*$" "\\1" SIP_VERSION_NUM ${sip_config})
STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${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})
@@ -9,6 +9,7 @@

sipcfg = sipconfig.Configuration()
print("sip_version:%06.0x" % sipcfg.sip_version)
print("sip_version_num:%d" % sipcfg.sip_version)
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)
@@ -39,9 +39,9 @@ IF(PYQT4_VERSION_NUM LESS 263680) # 0x040600
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
ENDIF(PYQT4_VERSION_NUM LESS 263680)

IF(NOT PYQT4_VERSION_NUM LESS 266496) # 0x041100
IF(NOT SIP_VERSION_NUM LESS 266496) # 0x041100
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
ENDIF(NOT PYQT4_VERSION_NUM LESS 266496)
ENDIF(NOT SIP_VERSION_NUM LESS 266496)

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

0 comments on commit 7172f01

Please sign in to comment.