Skip to content

Commit 5971fed

Browse files
author
wonder
committed
Set SIP minimal version to 4.7 (needed at least on OSX to support universal builds)
git-svn-id: http://svn.osgeo.org/qgis/trunk@9622 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 9d781fa commit 5971fed

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

cmake/Python.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ IF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
6363

6464
IF (HAVE_SIP_MODULE AND SIP_BINARY_PATH AND SIP_INCLUDE_DIR)
6565
# check for SIP version
66-
# minimal version is 4.5
67-
SET (SIP_MIN_VERSION 040500)
66+
# minimal version is 4.7 (to support universal builds)
67+
SET (SIP_MIN_VERSION 040700)
6868
TRY_RUN_PYTHON (RES "import sip\nprint '%x' % sip.SIP_VERSION" SIP_VERSION)
6969
IF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")
7070
SET (SIP_IS_GOOD TRUE)
7171
ENDIF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")
7272

7373
IF (NOT SIP_IS_GOOD)
74-
MESSAGE (STATUS "SIP is required in version 4.5 or later!")
74+
MESSAGE (STATUS "SIP is required in version 4.7 or later!")
7575
ENDIF (NOT SIP_IS_GOOD)
7676
ELSE (HAVE_SIP_MODULE AND SIP_BINARY_PATH AND SIP_INCLUDE_DIR)
7777
IF (NOT HAVE_SIP_MODULE)

0 commit comments

Comments
 (0)