-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[py3] CMake updates to support Python3 and PyQt5
- Loading branch information
Showing
22 changed files
with
239 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
0b6dd35
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@m-kuhn I get an error when running the "make install" command after making a qt4 qgis build:
CMake Error at python/PyQt/cmake_install.cmake:36 (file):
file INSTALL cannot find
"/home/webmaster/dev/cpp/QGIS/python/PyQt/QtWidgets.py".
Call Stack (most recent call first):
python/cmake_install.cmake:143 (include)
cmake_install.cmake:61 (include)
It should look for QtWidgets.py in the QGIS/python/PyQt/PyQt4 directory.
0b6dd35
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I get the same error, even after a clean install (deleted the build dir)
0b6dd35
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi!
Same error here on debian 8 stable.
As already said it searches in
/home//dev/cpp/QGIS/python/PyQt/ for the files but on my debian machine with Qt4 AND Qt5 installed there are
/home//dev/cpp/QGIS/python/PyQt/PyQt4/ AND
/home//dev/cpp/QGIS/python/PyQt/PyQt5/ Directories and I guess according to the switch it should either search in PyQt4 or PyQt5 Directory than in the PyQt Dir below them ..
0b6dd35
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you check if the latest commit on this branch fixes it: https://github.com/m-kuhn/QGIS/tree/installprefix
In particular, can you check that the files are installed in the end in the
PyQt/
directory and not aPyQt/PyQt4
directory.0b6dd35
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request opened #2474