sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-23 00:02:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
89,501 Commits 84 Branches 277 Tags
Commit Graph

554 Commits

Author SHA1 Message Date
Matthias Kuhn
072aca8f1d
No reason to handle undefined lookup 2024-12-31 12:18:16 +01:00
Matthias Kuhn
e22281d4db
Fix building on apple 2024-12-31 12:16:50 +01:00
Matthias Kuhn
c45b1f5c05 [cmake] Cleanup python libraries and includes 2024-12-31 10:45:27 +01:00
Julien Cabieces
51dc2ec2ac api(Deprecated): Generate always /Deprecated/ annotation with text 
Use cmake to remove text when SIP version is less than 6.9.0
 2024-12-17 09:06:44 +01:00
Matthias Kuhn
d255d21eff Use o2 library from https://github.com/qgis/o2/ 2024-12-10 11:48:09 +01:00
hxbb00
6f7afaf763
Fix: ALIAS not globally visible targets with old cmake (#59752) 
* Fix: ALIAS not globally visible targets with old cmake

* Compatible with cmake3.18 version
 2024-12-09 20:40:30 +01:00
Denis Rouzaud
0f032e5f2d run pre-commit on all files 2024-11-29 15:38:02 +01:00
Julien Cabieces
d4b8178d63 fix(Vcpkg): Don't install python3 if we build without bindings 2024-11-21 08:18:40 +10:00
مهدي شينون (Mehdi Chinoune)
260e565d13
Fix building with Qt6 on MinGW-w64 2024-11-03 21:48:08 +01:00
Matthias Kuhn
c08d697f40
Fix nuget binary caching for windows 2024-11-03 12:05:53 +01:00
Matthias Kuhn
d277e8420f
Merge branch 'master' into macvcpkg 2024-10-29 21:25:38 +01:00
Nyall Dawson
f8b91235dd [cmake] Create one command for many resources in ADD_QGIS_RESOURCES 
Instead of creating a single command for EVERY resource, just
build up a single command for ALL the resources.

This avoids thousands of lines of output when compiling, where
we get one line per resource file. Eg:

[890/11818 452.2/sec] Generating ../../output/data/svg/sport/sport_snooker.svg
[891/11818 451.8/sec] Generating ../../output/data/svg/sport/sport_soccer.svg

Since we're installing thousands and thousands of resources
(eg the svg symbols, cpt color ramp data, etc), this is all
just noise. And it's especially annoying on github runs where the
sheer length of the build log drags the whole page to a crawl!

This change reduces the total steps from ~11800 (as above), to
~5900
 2024-10-28 03:42:38 +10:00
Nicolas Godet
db4e98f2d1
Fix FindSIP.cmake and make it more verbose 2024-10-25 18:24:22 +02:00
Matthias Kuhn
ed08e3983b binary caching for non windows 2024-10-23 12:16:22 +02:00
Matthias Kuhn
11c70a7e60 Build with vcpkg deps 2024-10-07 17:08:17 +02:00
Simon Lopez
c06c7c938e Use CMake's SQLite targets 
This uses the same targets and variables introduced in
the FindSQLite3 module in CMake starting with version 3.14.

The other CMakeFiles.txt are modified accordingly.
 2024-09-13 20:59:46 +02:00
Matthias Kuhn
52f98f8c83
Merge pull request #57834 from m-kuhn/no_pyuic 
[plugins] Remove dependency on pyuic
 2024-06-30 08:44:08 +02:00
Matthias Kuhn
c268fb1403 Externalize nlohmann 2024-06-29 13:59:52 +02:00
Nyall Dawson
d64fbe2ade Revert "Use a centralized directory for files created by ctest" 
This reverts commit 2e85f6fa29da4e7f94a95656b470fa28b760dcab.
 2024-06-26 12:34:46 +10:00
Matthias Kuhn
fd663cc021 [plugins] Remove dependency on pyuic 
Eases plugin development and deployment
 2024-06-22 14:34:06 +02:00
Sandro Santilli
2e85f6fa29 Use a centralized directory for files created by ctest 
Defines a QGIS_TEST_TMP_DIR variable in top-level CMakeLists.txt
and then defines QGIS_CUSTOM_CONFIG_PATH and TMPDIR to be under
that directory for individual tests.

Closes GH-50587
Closes GH-48884
 2024-05-29 14:19:00 +02:00
Matthias Kuhn
1f00b40630
Merge pull request #57218 from troopa81/fix_sip_mod_dir 
[Qt6][Sip] Correctly retrieve PyQt module directory
 2024-04-25 16:10:03 +02:00
Julien Cabieces
32cd01431b Correctly retrieve PyQt5 module directory 2024-04-24 09:16:28 +02:00
Julien Cabieces
fa25acc782 [Qt6][Sip] Correctly retrieve PyQt module directory 2024-04-22 15:27:10 +02:00
Nyall Dawson
6785fe4554 [cmake] Use execute_process instead of deprecated EXEC_COMMAND 
See CMP0153
 2024-04-21 12:52:02 +10:00
Nyall Dawson
670ab67cc3 Add basic find lcms2 module 2024-02-12 12:48:27 +10:00
Matthias Kuhn
b9e859f0ed Find QtKeychain by its cmake target 2024-02-11 06:28:51 +10:00
Matthias Kuhn
b111d71f0e [poly2tri] modernize with using a cmake target 2024-02-08 08:45:50 +10:00
Julien Cabieces
3e27ac5985 [PyQt6] Build PyQt6 2024-01-16 12:18:11 +10:00
José de Paula R. N. Assis
62f4fa1cd0 Looking for qwt named as qwt6, also in /usr/lib64 
Adding /usr/lib64 as a possible search location for libqwt (in Gentoo,
generally 32 bit libraries reside in /usr/lib, and 64 bit, in
/usr/lib64; there might be other distributions that operate the same
way). Also, qwt might be named "libqwt6".
 2023-11-09 08:33:17 +10:00
bdm-oslandia
a66406f52b fix(cmake/FindQsci.cmake): set QSCI_VER to Qt major version instead of 5 
As it did not work with qt6
 2023-11-07 20:27:01 +01:00
bdm-oslandia
9ff43c4f3c fix(cmake/FindPyQt6.py): remove acces to PyQt6.QtCore.PYQT_CONFIGURATION 
PYQT_CONFIGURATION is only available on PyQt5
 2023-11-07 20:27:01 +01:00
Loïc Bartoletti
37ccd4a595
Merge pull request #54940 from nilason/fix_findpdal_2.6 
Fix CMake FindPDAL for PDAL version 2.6+
 2023-10-18 15:30:24 +02:00
Nicklas Larsson
30462f1324
set -DWIN32_LEAN_AND_MEAN in FindPDAL.cmake 2023-10-17 19:41:44 +02:00
Nicklas Larsson
021f919f24
cmake: update to find PDAL 2.6+ 
With PDAL 2.6 the 'pdal_util' library is removed as a separate library
and hence part of the 'pdalcpp' library.
 2023-10-17 19:41:44 +02:00
Laurențiu Nicola
2c7b4f30c6 Add USE_ALTERNATE_LINKER to cache if available 2023-10-17 18:50:18 +03:00
Juergen E. Fischer
8c62d89729 use draco release libraries also with MSVC (like the rest of the work including osgeo4w) 2023-10-07 16:23:01 +02:00
Matthias Kuhn
2c8e784625
Use geos cmake configuration (#54659) 2023-09-19 20:10:15 +00:00
Matthias Kuhn
80c1bc71e9
Merge pull request #54641 from m-kuhn/cmake-proj 
[cmake] Use proj cmake configuration and cleanup GDAL_INCLUDE_DIR
 2023-09-19 08:36:34 +02:00
Matthias Kuhn
b14be57c2d
Merge pull request #54640 from m-kuhn/fix_spatialite_no_pkgconf 
Do not require pkgconfig
 2023-09-18 17:49:11 +02:00
Matthias Kuhn
f278268161
Merge branch 'master' into cmake-proj 2023-09-18 17:29:04 +02:00
Matthias Kuhn
654bcacb29
Add doc 2023-09-18 13:44:46 +02:00
Matthias Kuhn
01b0eff8b8
Merge branch 'master' into cmake-gdal 2023-09-18 10:52:45 +02:00
Matthias Kuhn
789e92b054 [cmake] Use proj cmake configuration 2023-09-18 10:41:13 +02:00
Matthias Kuhn
1b5794302d Do not require pkgconfig 2023-09-18 10:23:52 +02:00
Matthias Kuhn
a42c02b4de Use GDAL cmake config 
and switch to target.
Perserve fallback GDAL discovery logic since GDALConfig is quite recent.
 2023-09-18 07:30:47 +02:00
Matthias Kuhn
173014016b [cmake] Use native find EXPAT logic 
and switch to using target EXPAT::EXPAT
 2023-09-18 06:12:18 +02:00
Matthias Kuhn
f67e339845
Merge pull request #54626 from m-kuhn/cmake-spatialite 
[cmake] Prefer pkgconfig for spatialite
 2023-09-17 21:34:18 +02:00
Matthias Kuhn
b9d0b4ce57 [cmake] Prefer pkgconfig for spatialite 
and use a target
 2023-09-16 12:13:09 +02:00
Matthias Kuhn
98483645cc Use cmake native FindGSL 
- this is part of CMake since 3.2
- works with pkgconfig (hence without gsl-config)
- properly propagates targets
- https://cmake.org/cmake/help/latest/module/FindGSL.html
 2023-09-15 16:11:43 +02:00