[QGIS Commit] r9622 - trunk/qgis/cmake

[svn_qgis at osgeo.org]

Author: wonder
Date: 2008-11-11 09:33:01 -0500 (Tue, 11 Nov 2008)
New Revision: 9622

Modified:
   trunk/qgis/cmake/Python.cmake
Log:
Set SIP minimal version to 4.7 (needed at least on OSX to support universal builds)


Modified: trunk/qgis/cmake/Python.cmake
===================================================================
--- trunk/qgis/cmake/Python.cmake	2008-11-11 13:36:37 UTC (rev 9621)
+++ trunk/qgis/cmake/Python.cmake	2008-11-11 14:33:01 UTC (rev 9622)
@@ -63,15 +63,15 @@
     
     IF (HAVE_SIP_MODULE AND SIP_BINARY_PATH AND SIP_INCLUDE_DIR)
       # check for SIP version
-      # minimal version is 4.5
-      SET (SIP_MIN_VERSION 040500)
+      # 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}")
         SET (SIP_IS_GOOD TRUE)
       ENDIF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")
     
       IF (NOT SIP_IS_GOOD)
-        MESSAGE (STATUS "SIP is required in version 4.5 or later!")
+        MESSAGE (STATUS "SIP is required in version 4.7 or later!")
       ENDIF (NOT SIP_IS_GOOD)
     ELSE (HAVE_SIP_MODULE AND SIP_BINARY_PATH AND SIP_INCLUDE_DIR)
       IF (NOT HAVE_SIP_MODULE)