[py3] CMake updates to support Python3 and PyQt5

qgis · Nov 16, 2015 · 0b6dd35 · 0b6dd35 · nirvn · Nov 17, 2015
1 parent 768bab8
commit 0b6dd35
Show file tree

Hide file tree

Showing 22 changed files with 239 additions and 73 deletions.
diff --git a/CMakeLists.txt b/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)

diff --git a/cmake/FindPyQt4.cmake b/cmake/FindPyQt4.cmake
@@ -27,7 +27,7 @@ IF(EXISTS PYQT4_VERSION)
   SET(PYQT4_FOUND TRUE)
 ELSE(EXISTS PYQT4_VERSION)
 
-  FIND_FILE(_find_pyqt_py FindPyQt.py PATHS ${CMAKE_MODULE_PATH})
+  FIND_FILE(_find_pyqt_py FindPyQt4.py PATHS ${CMAKE_MODULE_PATH})
 
   EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} OUTPUT_VARIABLE pyqt_config)
   IF(pyqt_config)

diff --git a/cmake/FindPyQt.py → cmake/FindPyQt4.py b/cmake/FindPyQt.py → cmake/FindPyQt4.py
@@ -60,7 +60,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"):

diff --git a/cmake/FindPyQt5.cmake b/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 FindPyQt5.py PATHS ${CMAKE_MODULE_PATH})
+
+  EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} 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)
diff --git a/cmake/FindPyQt5.py b/cmake/FindPyQt5.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+#
+#   Copyright (c) 2007, Simon Edwards <simon@simonzone.com>
+#    All rights reserved.
+#
+#    Redistribution and use in source and binary forms, with or without
+#    modification, are permitted provided that the following conditions are met:
+#        * Redistributions of source code must retain the above copyright
+#        notice, this list of conditions and the following disclaimer.
+#        * Redistributions in binary form must reproduce the above copyright
+#        notice, this list of conditions and the following disclaimer in the
+#        documentation and/or other materials provided with the distribution.
+#        * Neither the name of the  Simon Edwards <simon@simonzone.com> nor the
+#        names of its contributors may be used to endorse or promote products
+#        derived from this software without specific prior written permission.
+#
+#    THIS SOFTWARE IS PROVIDED BY Simon Edwards <simon@simonzone.com> ''AS IS'' AND ANY
+#    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+#    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+#    DISCLAIMED. IN NO EVENT SHALL Simon Edwards <simon@simonzone.com> BE LIABLE FOR ANY
+#    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+#    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+#    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# FindPyQt.py
+# Copyright (c) 2007, 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.
+
+try:
+    import PyQt5.pyqtconfig
+    pyqtcfg = PyQt5.pyqtconfig.Configuration()
+except ImportError:
+    import PyQt5.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, "PyQt5"), sip_dir):
+        if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")):
+            sip_dir = p
+            break
+    cfg = {
+        'pyqt_version': PyQt5.QtCore.PYQT_VERSION,
+        'pyqt_version_str': PyQt5.QtCore.PYQT_VERSION_STR,
+        'pyqt_sip_flags': PyQt5.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])
+
+print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version)
+print("pyqt_version_num:%d" % pyqtcfg.pyqt_version)
+print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str)
+
+pyqt_version_tag = ""
+in_t = False
+for item in pyqtcfg.pyqt_sip_flags.split(' '):
+    if item == "-t":
+        in_t = True
+    elif in_t:
+        if item.startswith("Qt_4"):
+            pyqt_version_tag = item
+    else:
+        in_t = False
+print("pyqt_version_tag:%s" % pyqt_version_tag)
+
+print("pyqt_mod_dir:%s" % pyqtcfg.pyqt_mod_dir)
+print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir)
+print("pyqt_sip_flags:%s" % pyqtcfg.pyqt_sip_flags)
+print("pyqt_bin_dir:%s" % pyqtcfg.pyqt_bin_dir)
diff --git a/cmake/FindPythonLibrary.cmake b/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)

diff --git a/cmake/FindQsci.cmake b/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.
 #
@@ -37,11 +37,11 @@ ELSE(EXISTS QSCI_MOD_VERSION_STR)
     )
 
     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)
 

diff --git a/cmake/FindQsci.py b/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)