31 Commits

Author SHA1 Message Date
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
Peter Petrik
3c4ccab1e5 try to fix bench test 2022-10-12 08:22:19 +10:00
Denis Rouzaud
80cf804db6
[cmake] modernize Qt libraries linking (#44416) 2021-07-28 11:27:22 +02:00
Nyall Dawson
0e72e012fe Bulk qt6 cmake updates
Remove more qt5 specific cmake config. Note that most of these are
untested on qt6, as the corresponding libraries cannot be built
with qt6 yet.
2021-07-28 13:44:59 +10:00
Nyall Dawson
a54efae892 Require c++17 to build 2021-02-25 11:08:56 +10:00
Denis Rouzaud
76a2869211 remove includes of binary dirs 2021-01-14 08:09:36 +10:00
Denis Rouzaud
23b50ab264
[cmake] remove of redundant includes (#40993) 2021-01-13 19:48:58 +01:00
Denis Rouzaud
e305a98417 [cmake] remove left-over of includes of src/core 2021-01-13 09:50:06 +01:00
Nyall Dawson
a9c80e5740 Code shuffle
Move vector, project and network related core .cpp/.h files into
dedicated subdirectories.

An attempt to organise src/core better to make things easier to find.
2020-12-29 11:38:11 +10:00
Denis Rouzaud
eddf6feb45 modernize CMakeLists.txt files 2020-11-12 07:14:46 +10:00
Nyall Dawson
a8adb2d6c2 Code shuffle: move all labeling related code into src/core/labeling
So that these files are all grouped together, making it easier to locate
all the components of the labeling engine and hopefully making things
easier to navigate
2019-12-11 14:05:44 +10:00
Denis Rouzaud
e214ea7ba6
Missing include 2019-11-07 20:37:14 +01:00
Even Rouault
e5c41b492c Fix compilation issues related to automoc'ification
Not sure why they trigger on my end and not on CI... Perhaps
because I didn't make clean. The symptoms are the linker complaining
about double definition of symbols.
2019-11-06 13:38:39 +10:00
Denis Rouzaud
8ef8efa7fb
include nlohmann/json_fwd.hpp in core source headers (#32294)
the file was manually added later to the installted headers, but not on mac

it is not possible to install a file in a Headers subfolder within a framework if the original header is not in the same cmake current directory

installing a header in a subdirectory is achieved by setting the MACOSX_PACKAGE_LOCATION property of the source file
but setting a property can only be achieved if it is in the same cmake directory (from the docs: Source file properties are visible only to targets added in the same directory [0])

[0] https://cmake.org/cmake/help/latest/command/set_source_files_properties.html
2019-10-18 09:08:12 +02:00
Alessandro Pasotti
63711510b6 Dear Qt, I love you but ...
... you are too slow and QJson API is so ugly.

Now using this wonderful json lib:
https://github.com/nlohmann/json

Results in release mode (QJson tests are not shown but
QJson was even slower than string concat).

PASS   : TestQgsJsonUtils::testExportAttributesJson(Use json)
RESULT : TestQgsJsonUtils::testExportAttributesJson():"Use json":
     0.0022 msecs per iteration (total: 75, iterations: 32768)
PASS   : TestQgsJsonUtils::testExportAttributesJson(Use old string concat)
RESULT : TestQgsJsonUtils::testExportAttributesJson():"Use old string concat":
     0.0032 msecs per iteration (total: 54, iterations: 16384)
PASS   : TestQgsJsonUtils::testExportFeatureJson(Use json)
RESULT : TestQgsJsonUtils::testExportFeatureJson():"Use json":
     0.011 msecs per iteration (total: 96, iterations: 8192)
PASS   : TestQgsJsonUtils::testExportFeatureJson(Use old string concat)
RESULT : TestQgsJsonUtils::testExportFeatureJson():"Use old string concat":
     0.015 msecs per iteration (total: 64, iterations: 4096)
PASS   : TestQgsJsonUtils::testExportGeomToJson(Use json)
RESULT : TestQgsJsonUtils::testExportGeomToJson():"Use json":
     0.76 msecs per iteration (total: 98, iterations: 128)
PASS   : TestQgsJsonUtils::testExportGeomToJson(Use old string concat)
RESULT : TestQgsJsonUtils::testExportGeomToJson():"Use old string concat":
     0.85 msecs per iteration (total: 55, iterations: 64)
PASS   : TestQgsJsonUtils::cleanupTestCase()
2019-04-18 17:04:30 +02:00
Nyall Dawson
3f6e411edb Remove some redundant geos includes 2018-04-26 17:28:59 +12:00
Nyall Dawson
3e1b99be69 Remove a bunch of Qt4 compatibility code 2018-02-06 22:39:42 +11:00
David Marteau
5534d743f1 Execute ln command with GNU compatible options
On some OSX macport installation, GNU commands may be used in favor
    of native commands and 'make install' fail with
         'ln: invalid option -- 'h'"

    As BSD ln support the GNU -n option as an equivalent of the -h option
    it shoud be preferred over the specific BSD option.
2017-09-15 09:27:31 +02:00
Matthias Kuhn
82455588c8 General include cleanup
This unifies the way the include directories are handled in the
CMakeLists.txt files.
Paths are now normally relative to the root of the source- or build dir.
They may still be relative for paths withing a plugin subdirectory but
should no longer be relative to paths outside of the current source- or
build-directory.

The previous approach had resultet in many different styles which are
hard to wrap ones head around if new to the build system.
It sometimes defined includes twice
By using relative paths, it was not possible to copy paste the paths
between different files.
2017-05-19 07:13:11 +02:00
Juergen E. Fischer
135882259c include metadata headers in install (followup 3a965e6d) 2017-05-08 13:21:23 +02:00
Andreas Sturmlechner
f9a064310a Don't link to QtWebKit when it's disabled 2017-02-24 11:10:11 +01:00
Juergen E. Fischer
6a56cb0dd0 updates and fixes for windows qt5/py3 build 2017-01-24 01:25:59 +01:00
Matthias Kuhn
0302719cf0 Add qgis_core.h to with CORE_EXPORT macro
This removes complexity from the compiler flags because defines
happen in a file.
2017-01-05 00:12:11 +01:00
Nyall Dawson
83ad380bd6 Switch QT4_* macros to QT5 2016-09-21 09:12:54 +10:00
Nyall Dawson
87c58f4541 Mark more includes as system includes 2016-01-08 16:43:27 +11:00
Marco Hugentobler
68fe5f5791 [FEATURE:] New geometry classes 2015-05-25 08:53:49 +02:00
Larry Shaffer
12e0f358a8 Set GDAL env vars for when gdal lib is bundled in app on Mac 2015-03-20 11:48:09 -06:00
Juergen E. Fischer
841af773e3 remove (outdated) internal spatialite 2015-01-04 16:18:01 +01:00
Larry Shaffer
a37c577fdd Fix 'geos_c.h not found' build error on Mac 2014-02-24 17:02:41 -07:00
Juergen E. Fischer
98dbb8e0fc use install rpath only on apple 2012-04-20 09:39:36 +02:00
Radim Blazek
555e028e73 benchmark program 2011-11-20 13:43:21 +01:00