14 lines
807 B
Diff
14 lines
807 B
Diff
--- qgis-1.4.0/cmake/Python.cmake 2009-08-19 21:09:10.000000000 +0200
|
|
+++ ../../qgis-1.4.0-sip410/cmake/Python.cmake 2010-05-12 20:46:28.884661938 +0200
|
|
@@ -148,8 +148,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}")
|