[QGIS Commit] r14324 - in trunk/qgis: cmake python

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-10-03 10:07:45 +0000 (Sun, 03 Oct 2010)
New Revision: 14324

Modified:
   trunk/qgis/cmake/FindSIP.cmake
   trunk/qgis/cmake/FindSIP.py
   trunk/qgis/python/CMakeLists.txt
Log:
fix for #2985 (take II)

Modified: trunk/qgis/cmake/FindSIP.cmake
===================================================================
--- trunk/qgis/cmake/FindSIP.cmake	2010-10-03 09:11:28 UTC (rev 14323)
+++ trunk/qgis/cmake/FindSIP.cmake	2010-10-03 10:07:45 UTC (rev 14324)
@@ -36,6 +36,7 @@
   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})

Modified: trunk/qgis/cmake/FindSIP.py
===================================================================
--- trunk/qgis/cmake/FindSIP.py	2010-10-03 09:11:28 UTC (rev 14323)
+++ trunk/qgis/cmake/FindSIP.py	2010-10-03 10:07:45 UTC (rev 14324)
@@ -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)

Modified: trunk/qgis/python/CMakeLists.txt
===================================================================
--- trunk/qgis/python/CMakeLists.txt	2010-10-03 09:11:28 UTC (rev 14323)
+++ trunk/qgis/python/CMakeLists.txt	2010-10-03 10:07:45 UTC (rev 14324)
@@ -39,9 +39,9 @@
   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)