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

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-05-15 03:28:28 -0400 (Sat, 15 May 2010)
New Revision: 13488

Modified:
   trunk/qgis/cmake/FindPyQt4.cmake
   trunk/qgis/python/CMakeLists.txt
Log:
fix #2720

Modified: trunk/qgis/cmake/FindPyQt4.cmake
===================================================================
--- trunk/qgis/cmake/FindPyQt4.cmake	2010-05-14 16:06:37 UTC (rev 13487)
+++ trunk/qgis/cmake/FindPyQt4.cmake	2010-05-15 07:28:28 UTC (rev 13488)
@@ -22,10 +22,10 @@
 #
 # PYQT4_SIP_FLAGS - The SIP flags used to build PyQt.
 
-IF(EXISTS PYQT4_VERSION_STR)
+IF(EXISTS PYQT4_VERSION)
   # Already in cache, be silent
   SET(PYQT4_FOUND TRUE)
-ELSE(EXISTS PYQT4_VERSION_STR)
+ELSE(EXISTS PYQT4_VERSION)
 
   FIND_FILE(_find_pyqt_py FindPyQt.py PATHS ${CMAKE_MODULE_PATH})
 
@@ -50,10 +50,4 @@
     ENDIF(PYQT4_FIND_REQUIRED)
   ENDIF(PYQT4_FOUND)
 
-ENDIF(EXISTS PYQT4_VERSION_STR)
-
-STRING(REGEX REPLACE "^([0-9]*)\\.[0-9]*\\.[0-9]*$" "\\1" PYQT4_MAJOR_VERSION ${PYQT4_VERSION_STR})
-STRING(REGEX REPLACE "^[0-9]*\\.([0-9]*)\\.[0-9]*$" "\\1" PYQT4_MINOR_VERSION ${PYQT4_VERSION_STR})
-STRING(REGEX REPLACE "^[0-9]*\\.[0-9]*\\.([0-9]*)$" "\\1" PYQT4_PATCH_VERSION ${PYQT4_VERSION_STR})
-MATH( EXPR PYQT4_NUM_VERSION "${PYQT4_MAJOR_VERSION}*10000 + ${PYQT4_MINOR_VERSION}*100 + ${PYQT4_PATCH_VERSION}")
-
+ENDIF(EXISTS PYQT4_VERSION)

Modified: trunk/qgis/python/CMakeLists.txt
===================================================================
--- trunk/qgis/python/CMakeLists.txt	2010-05-14 16:06:37 UTC (rev 13487)
+++ trunk/qgis/python/CMakeLists.txt	2010-05-15 07:28:28 UTC (rev 13488)
@@ -35,9 +35,9 @@
   ADD_DEFINITIONS(-DNOMINMAX)
 ENDIF(MSVC)
 
-IF(${PYQT4_NUM_VERSION} LESS 40600)
+IF(PYQT4_VERSION_TAG LESS 263680)	# 0x040600
   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
-ENDIF(${PYQT4_NUM_VERSION} LESS 40600)
+ENDIF(PYQT4_VERSION_TAG LESS 263680)
 
 # core module
 FILE(GLOB sip_files_core core/*.sip)