Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > da7ea0b667e9f719e342302f20db7398 > files > 2

qgis-1.4.0-1mdv2010.1.src.rpm

--- cmake/Python.cmake.sip	2009-08-19 21:09:10.000000000 +0200
+++ cmake/Python.cmake	2010-03-17 02:13:38.000000000 +0100
@@ -149,10 +149,10 @@
       # check for SIP version
       # minimal version is 4.7 (to support universal builds)
       SET (SIP_MIN_VERSION 040700)
-      TRY_RUN_PYTHON (RES "import sip\nprint '%x' % sip.SIP_VERSION" SIP_VERSION)
-      IF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")
+      TRY_RUN_PYTHON (RES "import sip\nprint '%06.0x' % sip.SIP_VERSION" SIP_VERSION)
+      IF (SIP_VERSION STREQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION STRGREATER "${SIP_MIN_VERSION}")
         SET (SIP_IS_GOOD TRUE)
-      ENDIF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")
+      ENDIF (SIP_VERSION STREQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION STRGREATER "${SIP_MIN_VERSION}")
     
       IF (NOT SIP_IS_GOOD)
         MESSAGE (STATUS "SIP is required in version 4.7 or later!")