Skip to content

Commit cc16649

Browse files
author
wonder
committed
No python bindings in 0.8.x releases so why to search for SIP and PyQt4 ?
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@7264 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent aa53d15 commit cc16649

File tree

2 files changed

+0
-56
lines changed

2 files changed

+0
-56
lines changed

CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ SET (PLUGINS_ALSO_BINARIES FALSE)
2828
SET (WITH_GRASS TRUE CACHE BOOL "Determines whether GRASS plugin should be built")
2929
SET (GRASS_PREFIX "" CACHE PATH "Path to GRASS base directory")
3030

31-
# try to configure and build python bindings by default
32-
SET (WITH_BINDINGS TRUE CACHE BOOL "Determines whether python bindings should be built")
3331

3432

3533
#############################################################

cmake/Python.cmake

-54
Original file line numberDiff line numberDiff line change
@@ -41,59 +41,5 @@ IF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
4141
IF (UNIX AND NOT APPLE)
4242
SET (PYTHON_LIBRARIES ${PYTHON_LIBRARIES} util)
4343
ENDIF (UNIX AND NOT APPLE)
44-
45-
IF (WITH_BINDINGS)
46-
47-
# check for SIP
48-
TRY_RUN_PYTHON (HAVE_SIP_MODULE "from sip import wrapinstance")
49-
FIND_PROGRAM (SIP_BINARY_PATH sip)
50-
51-
IF (HAVE_SIP_MODULE AND SIP_BINARY_PATH)
52-
# check for SIP version
53-
# minimal version is 4.5
54-
SET (SIP_MIN_VERSION 040500)
55-
TRY_RUN_PYTHON (RES "import sip\nprint '%x' % sip.SIP_VERSION" SIP_VERSION)
56-
IF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")
57-
SET (SIP_IS_GOOD TRUE)
58-
ENDIF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")
59-
60-
IF (NOT SIP_IS_GOOD)
61-
MESSAGE (STATUS "SIP is required in version 4.5 or later!")
62-
ENDIF (NOT SIP_IS_GOOD)
63-
ELSE (HAVE_SIP_MODULE AND SIP_BINARY_PATH)
64-
MESSAGE (STATUS "SIP not found!")
65-
ENDIF (HAVE_SIP_MODULE AND SIP_BINARY_PATH)
66-
67-
# check for PyQt4
68-
TRY_RUN_PYTHON (HAVE_PYQT4 "from PyQt4 import QtCore, QtGui, QtNetwork, QtSvg, QtXml")
69-
70-
IF (HAVE_PYQT4)
71-
# check for PyQt4 version
72-
# minimal version is 4.1
73-
SET (PYQT_MIN_VERSION 040100)
74-
TRY_RUN_PYTHON (RES "from PyQt4 import QtCore\nprint '%x' % QtCore.PYQT_VERSION" PYQT_VERSION)
75-
IF (PYQT_VERSION EQUAL "${PYQT_MIN_VERSION}" OR PYQT_VERSION GREATER "${PYQT_MIN_VERSION}")
76-
SET (PYQT_IS_GOOD TRUE)
77-
ENDIF (PYQT_VERSION EQUAL "${PYQT_MIN_VERSION}" OR PYQT_VERSION GREATER "${PYQT_MIN_VERSION}")
78-
79-
IF (NOT PYQT_IS_GOOD)
80-
MESSAGE (STATUS "PyQt4 is needed in version 4.1 or later!")
81-
ENDIF (NOT PYQT_IS_GOOD)
82-
ELSE (HAVE_PYQT4)
83-
MESSAGE (STATUS "PyQt4 not found!")
84-
ENDIF (HAVE_PYQT4)
85-
86-
# if SIP and PyQt4 are found, enable bindings
87-
IF (SIP_IS_GOOD AND PYQT_IS_GOOD)
88-
SET (HAVE_PYTHON TRUE)
89-
MESSAGE(STATUS "Python bindings enabled")
90-
ELSE (SIP_IS_GOOD AND PYQT_IS_GOOD)
91-
SET (HAVE_PYTHON FALSE)
92-
MESSAGE(STATUS "Python bindings disabled due dependency problems!")
93-
ENDIF (SIP_IS_GOOD AND PYQT_IS_GOOD)
94-
95-
ELSE (WITH_BINDINGS)
96-
MESSAGE(STATUS "Python bindings disabled")
97-
ENDIF (WITH_BINDINGS)
9844

9945
ENDIF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)

0 commit comments

Comments
 (0)