15 lines
874 B
Diff
15 lines
874 B
Diff
diff -ur qgis-1.0.2/cmake/Python.cmake qgis-1.0.2-sip410/cmake/Python.cmake
|
|
--- qgis-1.0.2/cmake/Python.cmake 2008-11-11 15:33:01.000000000 +0100
|
|
+++ qgis-1.0.2-sip410/cmake/Python.cmake 2010-02-05 22:35:47.000000000 +0100
|
|
@@ -64,8 +64,8 @@
|
|
IF (HAVE_SIP_MODULE AND SIP_BINARY_PATH AND SIP_INCLUDE_DIR)
|
|
# 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)
|
|
+ SET (SIP_MIN_VERSION 263936) # 0x040700
|
|
+ TRY_RUN_PYTHON (RES "import sip\nprint '%d' % 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}")
|