Dedup

CMakeLists.txt

@@ -674,27 +674,42 @@ ENDIF (UNIX AND NOT APPLE)
 #############################################################
 # Python build dependency
 
-FIND_PACKAGE(PythonInterp REQUIRED)
+IF(ENABLE_QT5)
+  SET(PYTHON_VER 3)
+ELSE(ENABLE_QT5)
+  SET(PYTHON_VER 2)
+ENDIF(ENABLE_QT5)
+
+FIND_PACKAGE(PythonInterp ${PYTHON_VER} REQUIRED)
 
 #############################################################
 # Python bindings
 
 IF (WITH_BINDINGS)
 
-  # python support: check for interpreter, sip, pyqt4
   FIND_PACKAGE(PythonLibrary REQUIRED)
+
+  # python support: check for interpreter, sip, pyqt4
+  IF(ENABLE_QT5)
+    FIND_PACKAGE(PyQt5 REQUIRED)
+    SET(PYQT_SIP_FLAGS ${PYQT5_SIP_FLAGS})
+    SET(PYQT_SIP_DIR ${PYQT5_SIP_DIR})
+  ELSE(ENABLE_QT5)
+    FIND_PACKAGE(PyQt4 REQUIRED)
+    # setup SIP variables
+    SET(PYQT_SIP_FLAGS ${PYQT4_SIP_FLAGS})
+    SET(PYQT_SIP_DIR ${PYQT4_SIP_DIR})
+  ENDIF(ENABLE_QT5)
+  SEPARATE_ARGUMENTS(PYQT_SIP_FLAGS) # convert space separated values to a list
+
   FIND_PACKAGE(SIP REQUIRED)
-  FIND_PACKAGE(PyQt4 REQUIRED)
   FIND_PACKAGE(Qsci REQUIRED)
   INCLUDE(PythonMacros)
+  INCLUDE(PyQtMacros)
   INCLUDE(SIPMacros)
-  INCLUDE(PyQt4Macros)
 
-  # setup SIP variables
-  SEPARATE_ARGUMENTS(PYQT4_SIP_FLAGS) # convert space separated values to a list
-  SET(SIP_INCLUDES ${PYQT4_SIP_DIR} ${CMAKE_SOURCE_DIR}/python)
+  SET(SIP_INCLUDES ${PYQT_SIP_DIR} ${CMAKE_SOURCE_DIR}/python)
   SET(SIP_CONCAT_PARTS 4)
-  SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS})
 
   IF (NOT BINDINGS_GLOBAL_INSTALL)
     SET(PYTHON_SITE_PACKAGES_DIR ${QGIS_DATA_DIR}/python)

cmake/FindPyQt.py

@@ -30,28 +30,45 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
+import argparse
+
+parser = argparse.ArgumentParser(description='Find the PyQt on the system.')
+parser.add_argument('--version', type=int, help='The major pyqt version to find (4 or 5, Default: 4)', default=4)
+
+version = parser.parse_args().version
+
+if version == 4:
+    from PyQt4 import QtCore
+    pyqt_sip_dir = 'PyQt4'
+elif version == 5:
+    from PyQt5 import QtCore
+    pyqt_sip_dir = 'PyQt5'
+else:
+    parser.print_help()
+    exit(1)
+
 try:
-    import PyQt4.pyqtconfig
-    pyqtcfg = PyQt4.pyqtconfig.Configuration()
-except ImportError:
-    import PyQt4.QtCore
     import sipconfig # won't work for SIP v5
     import os.path
     cfg = sipconfig.Configuration()
     sip_dir = cfg.default_sip_dir
-    for p in (os.path.join(sip_dir, "PyQt4"), sip_dir):
+    for p in (os.path.join(sip_dir, pyqt_sip_dir), sip_dir):
         if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")):
             sip_dir = p
             break
     cfg = {
-        'pyqt_version': PyQt4.QtCore.PYQT_VERSION,
-        'pyqt_version_str': PyQt4.QtCore.PYQT_VERSION_STR,
-        'pyqt_sip_flags': PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags'],
+        'pyqt_version': QtCore.PYQT_VERSION,
+        'pyqt_version_str': QtCore.PYQT_VERSION_STR,
+        'pyqt_sip_flags': QtCore.PYQT_CONFIGURATION['sip_flags'],
         'pyqt_mod_dir': cfg.default_mod_dir,
         'pyqt_sip_dir': sip_dir,
         'pyqt_bin_dir': cfg.default_bin_dir,
     }
     pyqtcfg = sipconfig.Configuration([cfg])
+except AttributeError:
+    # Legacy code
+    import PyQt4.pyqtconfig
+    pyqtcfg = PyQt4.pyqtconfig.Configuration()
 
 print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version)
 print("pyqt_version_num:%d" % pyqtcfg.pyqt_version)
@@ -60,7 +77,7 @@
 pyqt_version_tag = ""
 in_t = False
 for item in pyqtcfg.pyqt_sip_flags.split(' '):
-    if item=="-t":
+    if item == "-t":
         in_t = True
     elif in_t:
         if item.startswith("Qt_4"):

cmake/FindPyQt4.cmake

@@ -29,7 +29,7 @@ ELSE(EXISTS PYQT4_VERSION)
 
   FIND_FILE(_find_pyqt_py FindPyQt.py PATHS ${CMAKE_MODULE_PATH})
 
-  EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} OUTPUT_VARIABLE pyqt_config)
+  EXECUTE_PROCESS(COMMAND "${PYTHON_EXECUTABLE} ${_find_pyqt_py} --version=4" OUTPUT_VARIABLE pyqt_config)
   IF(pyqt_config)
     STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT4_VERSION ${pyqt_config})
     STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1" PYQT4_VERSION_STR ${pyqt_config})
@@ -54,5 +54,3 @@ ELSE(EXISTS PYQT4_VERSION)
   ENDIF(PYQT4_FOUND)
 
 ENDIF(EXISTS PYQT4_VERSION)
-
-

cmake/FindPyQt5.cmake

@@ -0,0 +1,56 @@
+# Find PyQt5
+# ~~~~~~~~~~
+# Copyright (c) 2007-2008, Simon Edwards <simon@simonzone.com>
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+# PyQt5 website: http://www.riverbankcomputing.co.uk/pyqt/index.php
+#
+# Find the installed version of PyQt5. FindPyQt5 should only be called after
+# Python has been found.
+#
+# This file defines the following variables:
+#
+# PYQT5_VERSION - The version of PyQt5 found expressed as a 6 digit hex number
+#     suitable for comparision as a string
+#
+# PYQT5_VERSION_STR - The version of PyQt5 as a human readable string.
+#
+# PYQT5_VERSION_TAG - The PyQt version tag using by PyQt's sip files.
+#
+# PYQT5_SIP_DIR - The directory holding the PyQt5 .sip files.
+#
+# PYQT5_SIP_FLAGS - The SIP flags used to build PyQt.
+
+IF(EXISTS PYQT5_VERSION)
+  # Already in cache, be silent
+  SET(PYQT5_FOUND TRUE)
+ELSE(EXISTS PYQT5_VERSION)
+
+  FIND_FILE(_find_pyqt_py FindPyQt.py PATHS ${CMAKE_MODULE_PATH})
+
+  EXECUTE_PROCESS(COMMAND "${PYTHON_EXECUTABLE} ${_find_pyqt_py} --version=5" OUTPUT_VARIABLE pyqt_config)
+  IF(pyqt_config)
+    STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT5_VERSION ${pyqt_config})
+    STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1" PYQT5_VERSION_STR ${pyqt_config})
+    STRING(REGEX REPLACE ".*\npyqt_version_tag:([^\n]+).*$" "\\1" PYQT5_VERSION_TAG ${pyqt_config})
+    STRING(REGEX REPLACE ".*\npyqt_version_num:([^\n]+).*$" "\\1" PYQT5_VERSION_NUM ${pyqt_config})
+    STRING(REGEX REPLACE ".*\npyqt_mod_dir:([^\n]+).*$" "\\1" PYQT5_MOD_DIR ${pyqt_config})
+    STRING(REGEX REPLACE ".*\npyqt_sip_dir:([^\n]+).*$" "\\1" PYQT5_SIP_DIR ${pyqt_config})
+    STRING(REGEX REPLACE ".*\npyqt_sip_flags:([^\n]+).*$" "\\1" PYQT5_SIP_FLAGS ${pyqt_config})
+    STRING(REGEX REPLACE ".*\npyqt_bin_dir:([^\n]+).*$" "\\1" PYQT5_BIN_DIR ${pyqt_config})
+
+    SET(PYQT5_FOUND TRUE)
+  ENDIF(pyqt_config)
+
+  IF(PYQT5_FOUND)
+    IF(NOT PYQT5_FIND_QUIETLY)
+      MESSAGE(STATUS "Found PyQt5 version: ${PYQT5_VERSION_STR}")
+    ENDIF(NOT PYQT5_FIND_QUIETLY)
+  ELSE(PYQT5_FOUND)
+    IF(PYQT5_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find Python")
+    ENDIF(PYQT5_FIND_REQUIRED)
+  ENDIF(PYQT5_FOUND)
+
+ENDIF(EXISTS PYQT5_VERSION)

cmake/FindPythonLibrary.cmake

@@ -44,11 +44,15 @@ else(EXISTS "${PYTHON_INCLUDE_PATH}" AND EXISTS "${PYTHON_LIBRARY}" AND EXISTS "
     endif("${PYTHON_CUSTOM_FRAMEWORK}" MATCHES "Python\\.framework")
   endif(APPLE AND PYTHON_CUSTOM_FRAMEWORK)
 
-  FIND_PACKAGE(PythonInterp)
-
-  if(PYTHONINTERP_FOUND)
+  IF (ENABLE_QT5)
+    FIND_PACKAGE(PythonInterp 3)
+    ADD_DEFINITIONS(-DPYTHON3)
+  ELSE (ENABLE_QT5)
+    FIND_PACKAGE(PythonInterp 2)
     ADD_DEFINITIONS(-DPYTHON2)
+  ENDIF (ENABLE_QT5)
 
+  if(PYTHONINTERP_FOUND)
     FIND_FILE(_find_lib_python_py FindLibPython.py PATHS ${CMAKE_MODULE_PATH})
 
     EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE}  ${_find_lib_python_py} OUTPUT_VARIABLE python_config)
@@ -65,7 +69,7 @@ else(EXISTS "${PYTHON_INCLUDE_PATH}" AND EXISTS "${PYTHON_LIBRARY}" AND EXISTS "
         endif(NOT PYTHON_LIBS_WITH_KDE_LIBS)
       endif(NOT PYTHON_SITE_PACKAGES_DIR)
       STRING(REGEX REPLACE "([0-9]+).([0-9]+)" "\\1\\2" PYTHON_SHORT_VERSION_NO_DOT ${PYTHON_SHORT_VERSION})
-      set(PYTHON_LIBRARY_NAMES python${PYTHON_SHORT_VERSION} python${PYTHON_SHORT_VERSION_NO_DOT})
+      set(PYTHON_LIBRARY_NAMES python${PYTHON_SHORT_VERSION} python${PYTHON_SHORT_VERSION_NO_DOT} python${PYTHON_SHORT_VERSION}m python${PYTHON_SHORT_VERSION_NO_DOT}m)
       if(WIN32)
           STRING(REPLACE "\\" "/" PYTHON_SITE_PACKAGES_DIR ${PYTHON_SITE_PACKAGES_DIR})
       endif(WIN32)

cmake/FindQsci.cmake

@@ -1,4 +1,4 @@
-# Find QScintilla2 PyQt4 module
+# Find QScintilla2 PyQt module
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 # QScintilla2 website: http://www.riverbankcomputing.co.uk/software/qscintilla/
@@ -8,7 +8,7 @@
 #
 # This file defines the following variables:
 #
-# QSCI_FOUND - system has QScintilla2 PyQt4 module
+# QSCI_FOUND - system has QScintilla2 PyQt module
 #
 # QSCI_MOD_VERSION_STR - The version of Qsci module as a human readable string.
 #
@@ -31,17 +31,24 @@ 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(ENABLE_QT5)
+      FIND_PATH(QSCI_SIP_DIR
+        NAMES Qsci/qscimod5.sip
+        PATHS ${PYQT5_SIP_DIR}
+      )
+    ELSE(ENABLE_QT5)
+      FIND_PATH(QSCI_SIP_DIR
+        NAMES Qsci/qscimod4.sip
+        PATHS ${PYQT4_SIP_DIR}
+      )
+    ENDIF(ENABLE_QT5)
 
     IF(NOT QSCI_FIND_QUIETLY)
-      MESSAGE(STATUS "Found QScintilla2 PyQt4 module: ${QSCI_MOD_VERSION_STR}")
+      MESSAGE(STATUS "Found QScintilla2 PyQt module: ${QSCI_MOD_VERSION_STR}")
     ENDIF(NOT QSCI_FIND_QUIETLY)
   ELSE(QSCI_FOUND)
     IF(QSCI_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find QScintilla2 PyQt4 module")
+      MESSAGE(FATAL_ERROR "Could not find QScintilla2 PyQt module")
     ENDIF(QSCI_FIND_REQUIRED)
   ENDIF(QSCI_FOUND)
 

cmake/FindQsci.py

@@ -25,7 +25,7 @@
 #    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 #    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-"""Find QScintilla2 PyQt4 module version.
+"""Find QScintilla2 PyQt4/PyQt5 module version.
 
 .. note:: Redistribution and use is allowed according to the terms of the BSD
 license. For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -39,6 +39,10 @@
     from PyQt4.Qsci import QSCINTILLA_VERSION_STR
     VER = QSCINTILLA_VERSION_STR
 except ImportError:
-    VER = ""
+    try:
+        from PyQt5.Qsci import QSCINTILLA_VERSION_STR
+        VER = QSCINTILLA_VERSION_STR
+    except ImportError:
+        VER = ""
 
 print("qsci_version_str:%s" % VER)