sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
66,003 Commits 82 Branches 277 Tags
Commit Graph

422 Commits

Author SHA1 Message Date
Damiano Lombardi
a27420e7c8 Fix cmake config to find qca headers on Opensuse tumbleweed 2020-09-08 07:11:03 +10:00
Dmitry Shachnev
0506895753 Make FindPyQt5.py compatible with SIP v5 2020-07-21 21:49:46 +03:00
Dmitry Shachnev
426098bb86 FindPyQt5.py: Read version and SIP flags directly from PyQt5 
And fix Qt version tag detection.
 2020-07-21 21:46:24 +03:00
Dmitry Shachnev
e78841214e Generate sip.h in source directory for SIP v5 2020-07-21 21:21:21 +03:00
Dmitry Shachnev
d0c4e0de9d Use SIP_INCLUDE_DIR and SIP_MODULE_DIR only with SIP v4 2020-07-21 21:21:21 +03:00
Dmitry Shachnev
33b58dd7e8 Make FindSIP.py compatible with SIP v5 2020-07-21 21:21:21 +03:00
Alexander Bruy
60397ffa42 fix argument in the CMake IF statement (followup 4009fa8e22) 2020-07-20 12:21:27 +03:00
Daniel Minor
4009fa8e22 Fix FindPyQt5 cmake and python scripts 
As written, the FindPyQt5.cmake and FindPyQt5.py scripts will succeed even if
PyQt5 is not installed. In FindPyQt5.cmake, we have PYQT5_FIND_REQUIRED rather
than PyQt5_FIND_REQUIRED, so the package is always treated as though it is
optional. In FindPyQt5.py, the script will succeed with a default location for
the sip directory, even if the PyQt5 directory is not located.

For some systems, if enough other dependencies are installed, the build can
get about halfway complete without the main PyQt5 dependency, and then fail
with a message like:

sip: Unable to find file "QtXml/QtXmlmod.sip"

I hit this building on Ubuntu, and there have been a few similar bug reports in
the past.
 2020-07-16 08:41:14 +10:00
Peter Petrik
dcd017a655
Remove txt2tags dependency (use markdown instead) 2020-06-10 10:00:22 +10:00
José de Paula Rodrigues Neto Assis
c91e0e8450 Drop Globe plugin 
Dropping Globe plugin from the QGIS sources. It depends on osgearth no
newer than version 2.8, released on 2016-09-05, and which is impossible
to build against modern (Qt 5.13+) versions of Qt. With this, the
optional QGIS dependency on OpenSceneGraph and osgearth is also removed.
 2020-05-25 08:29:03 +10:00
Loïc Bartoletti
72d19c9016 Allow to search multi paths 2020-05-19 07:43:58 +10:00
Nyall Dawson
b6a7a10703 Fix some more python formatting issues, remove more flake exceptions 2020-05-11 11:41:50 +10:00
Nyall Dawson
85d543a739 Rename scripts to swap "-" for "_" for consistency 
We had a confusing and unpredictable mix of script names with
- vs _, e.g. scripts/prepare-commit.sh vs scripts/sipify_all.sh

This unifies with the preferred _ convention for script file names
 2020-04-28 02:22:33 +10:00
Matthias Kuhn
11a90610e6
Merge pull request #35814 from suricactus/build_find_qgis 
Fix QGIS_PREFIX_PATH to work for QGIS_INCLUDE_DIR
 2020-04-16 18:35:22 +02:00
Ivan Ivanov
b689dde319 Fix QGIS_PREFIX_PATH to work for QGIS_INCLUDE_DIR 2020-04-16 15:59:01 +03:00
Peter Petrik
62bcc92339
MacOS CI (#35407) 
[infrastructure] [macos] use QGIS-Mac-Packager dependencies to setup MacOS CI build with GitHub workflows. Use CMake's define QGIS_MAC_DEPS_DIR to define folder to dependencies
 2020-04-05 10:51:00 +02:00
William Kyngesburye
857ad0a678 handle quick for Mac bundling 2020-03-18 03:03:44 +10:00
Juergen E. Fischer
342e6db828 Fix FindProj.cmake (followup 38e57db0ed387e32) 2020-02-21 08:37:08 +01:00
Nyall Dawson
38e57db0ed Hard block compilation on proj 6.3.0 
Require 6.3.1 for critical fixes
 2020-02-21 02:42:12 +10:00
lbartoletti
58f1206748 Fix build with txt2tags >= 3.5 2020-02-09 18:53:04 +01:00
Nyall Dawson
aad4e84438 Remove old Qt4 compatibility module 2020-02-08 15:17:47 +10:00
lbartoletti
c3898d9aa4 [FreeBSD] Update FindGRASS.cmake 2020-02-04 07:43:59 +10:00
Blottiere Paul
f7b325f931 Find PyQt5 sip files 2020-01-29 11:49:44 +01:00
Even Rouault
3fbeb4ba02 FindGDAL/FindProj.cmake: for GDAL 3, requires 3.0.3 or higher. For PROJ 6, requires 6.3.0 or higher 2020-01-27 16:24:52 +10:00
Juergen E. Fischer
b9278b7b94 * include flip and python3-autopep8 in INSTALL 
* txt2tags 3.4 doesn't support macros (used date & modtime) anymore

closes #33850, followup 157a6700cac6
 2020-01-16 17:02:40 +01:00
Peter Petrik
284abe074c add python directory to cache so can be modified by ccmake 2019-12-05 07:08:50 +01:00
Matthias Kuhn
5eac13558b Find QWT headers also in /usr/include/qt5 
That is where Fedora puts them
 2019-11-03 09:16:59 +01:00
Alessandro Pasotti
d67c934684 Fix MXE builds 2019-10-30 11:01:46 +01:00
Matthias Kuhn
55660d6bae Add the cmake docs while I still remember how things are supposed to work 2019-10-26 08:28:51 +10:00
Matthias Kuhn
f65d3aa365 Fix install paths 2019-10-26 08:28:51 +10:00
Matthias Kuhn
e6a06ec3b2 Also copy svg, icons and doc to build dir, into /data/ subdir 2019-10-26 08:28:51 +10:00
Sandro Santilli
84325e69c1 Simplify GEOS version extraction code 2019-10-11 08:24:56 +02:00
Sandro Santilli
f467fc5876 Fix detection of GEOS release candidate versions 
Closes #32170
 2019-10-11 14:06:55 +10:00
Juergen E. Fischer
06b24d164a update INSTALL.html 2019-08-04 10:35:37 +02:00
Māris Nartišs
7e0181bcb7 Build: Bump minimum Proj version to 4.9.3 (Fixes #30675) 2019-08-04 09:01:39 +10:00
Sandro Mani
1ed3c91409 Only use pyuic-wrapper.bat when compiling on windows hosts 2019-07-31 11:03:06 +10:00
Sandro Mani
dbb2aa2002 Fix invalid use of EXISTS used to check whether a variable is set 2019-07-31 11:03:06 +10:00
Sandro Mani
5c5237149c Pass NO_CMAKE_FIND_ROOT_PATH when invoking FIND_FILE to find local files 
Otherwise, when cross-compiling, the prefix of the cross environment (i.e. /usr/x86_64-w64-mingw32/) is prepended to the path, leading to the files not being found
 2019-07-31 11:03:06 +10:00
Denis Rouzaud
2b9ee87b9b pyrcc5: remove obsolete parameter 2019-07-11 06:18:17 +10:00
Denis Rouzaud
549da3dddb
update error message, Qt 4 is goooone 2019-07-09 15:21:09 +02:00
Nyall Dawson
fb359049ee Fix dox 2019-07-08 12:42:02 +10:00
Nyall Dawson
f8655dc8a4 Don't allow building QGIS on proj 6.0 versions 
Require at least 6.1.0. We need proj_normalize_for_visualization,
and the workarounds for building without it are too extensive,
too fragile, and result in too much spaghetti code.

Gotta make the hard call here ;)
 2019-06-03 16:46:54 +10:00
Juergen E. Fischer
a19fc89e5f osgeo4w: updates for grass 7.6.1 2019-03-23 02:08:30 +01:00
Juergen E. Fischer
3630fdc4a1 fix cmake warning 2019-03-19 14:47:25 +01:00
Nyall Dawson
ad7e8eac74 More flexible proj version handling 
Sponsored by ICSM
 2019-03-19 11:47:01 +10:00
Nyall Dawson
28df1b4651 Fix missing SIP_VERSION preprocessor macro 
Was breaking all #if SIP_VERSION checks - most importantly
preventing exitPython() from being called correctly on QGIS
exit.
 2019-03-01 05:45:12 +10:00
Rashad Kanavath
8e78d2015d [test] Avoid "NOTFOUND" in LD_LIBRARY_PATH environment variable 2019-02-23 05:20:17 +10:00
lbartoletti
8c18a5c8f9 [FreeBSD] GRASS inverse searching order 
+1 with @neteler
"start with searching the newest GRASS GIS version first"
https://github.com/qgis/QGIS/pull/9174#issuecomment-464729754

cc  @rhurlin
 2019-02-20 10:28:04 +10:00
Markus Neteler
45434a5e3a
Added grass76 support 
Added grass76 support; search for newer versions first
 2018-12-27 12:58:33 +01:00
Simon Wells
e91cd93cc1 Remove PATH_SUFFIX as it is no longer needed, as it is optional it is not sufficient to be used in place of spatialindex/ 2018-11-21 16:13:44 +11:00