275 Commits

Author SHA1 Message Date
Matthias Kuhn
d559d7ff25 Partially revert 9bb3235
The -DCMAKE_POSITION_INDEPENDENT_CODE=ON resolves to -fPIE instead
of -fPIC (on some platforms?) rendering cmake broken.
2016-11-23 09:26:44 +01:00
Larry Shaffer
d712b49a74 Merge pull request #3790 from dakcarto/qt5py3-mac-fixes
Qt5py3 Mac fixes
2016-11-22 21:29:38 -07:00
Alexander Bruy
5cbf9d5129 remove references to networkanalysis from scrips and packaging files 2016-11-21 16:47:24 +02:00
Larry Shaffer
eca83e3c0f Add CMAKE_POSITION_INDEPENDENT_CODE flag to QCA test for OSSL plugin 2016-11-20 17:25:43 -07:00
Larry Shaffer
c123d3b62f Add a CMake debug include, with simple variables dump for development 2016-11-20 15:30:12 -07:00
Larry Shaffer
5df9cbc964 Remove Python framework options/finding for Mac; add Homebrew support
Instead of finding Python interpreter, library and framework on Mac,
rely upon the reported paths of the interpreter (executable) to decipher
whether a framework is being used, then ensure any such framework has
its versioned subdirectory Headers used for includes and the base
Python library used directly in linking. This removes ambiguity in
framework searching, allowing just the PYTHON_EXECUTABLE (user-defined
or from FindPythonInterp module) to control which Python is used.
2016-11-20 15:30:12 -07:00
Larry Shaffer
9bb32357c7 Update finding QCA OSSL plugin for Qt5 and C++11 2016-11-20 15:30:12 -07:00
Larry Shaffer
74dfd1f4b0 Check for Qt5-specific version of Mac qca framework 2016-11-20 15:30:12 -07:00
Larry Shaffer
e9fa3e0488 Check for Qt5 subdirectory in PYQT5_SIP_DIR 2016-11-20 15:30:12 -07:00
Juergen E. Fischer
73b283c0b5 update FindQCA.cmake for Arch Linux 2016-11-10 13:47:50 +01:00
Juergen E. Fischer
6acf0f745f msvc: use /bigobj for sip modules
(cherry picked from commit d0b3e39cdab1da17d7a977ba3def5ce1b64ff707)
2016-10-22 12:28:44 +02:00
Juergen E. Fischer
8194de9b15 windows: prefer spatialite_i over spatialite
(cherry picked from commit 219a97c35b7c1d8a8943d4e2e47a8956288320b4)
2016-10-17 20:13:56 +02:00
David Marteau
47c3726ac9 Fix python print statement for python 3 in cmake/MacBundleMacros.cmake (#3531) 2016-09-27 12:58:46 +02:00
Nyall Dawson
75512e9322 Fix QCA configuration on Qt5 2016-09-21 10:59:37 +10:00
Nyall Dawson
88e4410af1 Require Qt >= 5.5 2016-09-21 09:12:54 +10:00
Nyall Dawson
616a80f48e Bump minimum GEOS version to 3.3 2016-08-17 06:43:02 +10:00
Juergen E. Fischer
daea10c126 support utf-8 encoded release names
(cherry picked from commit c9838ccea481c8ca87c4e1647099cfe78777e795)
2016-07-10 12:09:29 +02:00
Matthias Kuhn
4b6d38c4c4 Add option to suppress SIP warnings (#3230)
to fix travis builds for OSX. Yay
2016-06-23 16:16:51 +02:00
Matthias Kuhn
f43b2ac47a Followup d3fd818: do not hide python module symbols 2016-06-11 12:05:44 +02:00
Sandro Mani
90887f460f Revived globe, compatible with OsgEarth 2.7 2016-05-28 10:09:34 +02:00
Nathan Woodrow
b028c09e82 [build] Add better support for Ninja build system 2016-05-23 12:42:36 +02:00
Matthias Kuhn
7dfc69657f Migrate provider test to python 3 2016-05-13 22:23:03 +02:00
Matthias Kuhn
89b7a4aaa2 Introduce NULL QVariant to PyQt5 2016-05-13 22:23:03 +02:00
Even Rouault
7703ad88ac cmake/FindGDAL.cmake: emit warning if GDAL < 1.11 2016-04-27 14:35:37 +02:00
Matthias Kuhn
7709f3f001 Copyable output of testing environment variables 2016-03-27 13:31:14 +02:00
Matthias Kuhn
6b098b7abb Specify python version for test python interpreter 2016-03-22 09:17:16 +01:00
Bas Couwenberg
81c5f25a7f Don't require Python 3 for Qt5.
Use separate ENABLE_PYTHON3 option for Python 3.
2016-03-16 10:55:49 +01:00
Juergen E. Fischer
4089ed8f01 fix pyuic wrapper 2016-03-16 00:34:24 +01:00
Juergen E. Fischer
fb3fcfa3a0 Python3/Qt5/2to3 updates:
* pyqtwrappers update (add QtNetwork, QtXml, QtSql, QtTest, uic)
* 2to3 updates
* move QPyNullVariant/NULL to PyQt.QtCore
* add global unicode/basestring/long for Python3
* expand QtGui, QtCore module and star exports
* Qscintilla2
* replace Set import with set builtin
2016-03-14 20:38:20 +01:00
Matthias Kuhn
264527a495 [PyQt5] make pyuic4-wrapper PyQt5 aware 2016-03-10 18:44:22 +01:00
Matthias Kuhn
ae6fad3dc4 Decapitalize FindSpatiaLite cmake file 2016-03-10 18:44:22 +01:00
Matthias Kuhn
72764b2937 Simplfiy some python3 handling 2016-03-09 12:35:18 +01:00
Juergen E. Fischer
eeeb378975 fix e961a52 2016-01-06 06:24:53 +01:00
Juergen E. Fischer
e961a52c6a revive python tests on windows (followup afcf567) 2016-01-05 23:34:02 +01:00
Michael Kirk
afcf567ebb [Processing] fixup parameters test
- Broke into per class testcase
- Each method tries to test only one aspect of behavior
- Use unittest assertions for better error output
- Removed non-existant serialize functionality from tests
- Test BooleanParameter

Conflicts:
	python/plugins/processing/core/parameters.py
2015-12-24 15:14:02 +01:00
Sebastian Dietrich
c9b75528af have CMake find Python library on Windows 2015-11-21 12:21:07 +01:00
Matthias Kuhn
b1eb812792 Do not require manual CMakeCache intervention 2015-11-19 08:35:13 +01:00
Matthias Kuhn
eeef84b1f7 Revert "Deduplicated FindPyQt(4|5).py"
This reverts commit 842c17c10b2112b0d92ab287d76e374900736065 which was
responsible for test timeouts for dubious reasons.
2015-11-17 13:57:11 +01:00
Juergen E. Fischer
1675703ddb qt5 fixes 2015-11-17 01:00:08 +01:00
Juergen E. Fischer
51295273ff fix pyrcc4 detection on windows (followup 0b6dd352) 2015-11-16 17:16:46 +01:00
Matthias Kuhn
842c17c10b Deduplicated FindPyQt(4|5).py 2015-11-16 07:42:48 +01:00
Matthias Kuhn
0b6dd352c9 [py3] CMake updates to support Python3 and PyQt5 2015-11-16 07:42:47 +01:00
Matthias Kuhn
f1fe98558a [qt5] Fix QCA Cmake 2015-11-12 14:14:03 +01:00
Matthias Kuhn
1bb7aff067 [qt5] Fix QScintilla cmake file 2015-11-12 14:14:03 +01:00
Juergen E. Fischer
9d97c7c41b fix typo in python test invocation 2015-11-08 18:03:22 +00:00
Denis Rouzaud
8030746674 find libraries for Qt5 2015-11-07 11:32:23 -05:00
Matthias Kuhn
cd0eb05ded [py3] Some compatibility fixes for python 3 2015-10-24 13:47:32 +02:00
Radim Blazek
ca70491363 [GRASS] try to get off_t from Make/platform.h 2015-10-22 11:01:07 +02:00
Radim Blazek
898a738451 [GRASS] cmake add check if version.h exists 2015-10-20 18:54:29 +02:00
Radim Blazek
e37ae8bad0 [GRASS] cmake fix 2015-10-18 14:22:49 +02:00