make sip bindings to qscintilla derived classes optional (replaces 7e…

…815ca & 8f0b898)

cmake/FindQsci.cmake

@@ -31,6 +31,11 @@ ELSE(EXISTS QSCI_MOD_VERSION_STR)
   ENDIF(qsci_ver)
 
   IF(QSCI_FOUND)
+    FIND_PATH(QSCI_SIP_DIR
+      NAMES Qsci/qscimod4.sip
+      PATHS ${PYQT4_SIP_DIR}
+    )
+
     IF(NOT QSCI_FIND_QUIETLY)
       MESSAGE(STATUS "Found QScintilla2 PyQt4 module: ${QSCI_MOD_VERSION_STR}")
     ENDIF(NOT QSCI_FIND_QUIETLY)

cmake/FindQsci.py

@@ -41,5 +41,4 @@
 except ImportError:
     VER = ""
 
-
 print("qsci_version_str:%s" % VER)

debian/rules

@@ -62,8 +62,7 @@ CMAKE_OPTS := \
 	-DWITH_INTERNAL_PYGMENTS=FALSE \
 	-DWITH_INTERNAL_DATEUTIL=FALSE \
 	-DWITH_INTERNAL_PYTZ=FALSE \
-	-DWITH_INTERNAL_SIX=FALSE \
-	-DWITH_INTERNAL_QSCINTILLA2_SIPS=TRUE
+	-DWITH_INTERNAL_SIX=FALSE
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))

python/CMakeLists.txt

@@ -144,9 +144,12 @@ INCLUDE_DIRECTORIES(
 FILE(GLOB_RECURSE sip_files_gui gui/*.sip)
 SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui})
 SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
-IF(WITH_INTERNAL_QSCINTILLA2_SIPS)
-  SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${CMAKE_CURRENT_SOURCE_DIR}/ext-libs/python-qscintilla2)
-ENDIF(WITH_INTERNAL_QSCINTILLA2_SIPS)
+IF(QSCI_SIP_DIR)
+  SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR})
+ELSE(QSCI_SIP_DIR)
+  MESSAGE(STATUS "Qsci sip file not found - disabling bindings for derived classes")
+  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_QSCI_SIP)
+ENDIF(QSCI_SIP_DIR)
 
 IF(UNIX AND NOT SIP_VERSION_NUM LESS 265984)
   SET(SIP_EXTRA_OPTIONS -P ${SIP_EXTRA_OPTIONS})