357 Commits

Author SHA1 Message Date
Denis Rouzaud
088e94f909 [cmake] fix deprecated OLD policy for CMP0053
https://cmake.org/cmake/help/v3.1/policy/CMP0053.html
2018-06-08 08:06:26 +10:00
Even Rouault
917a6e3cdc
QCAMacros.cmake: re-add 25ba36180cfbf836b9458beb98e28f62349c4260 for FreeBSD 2018-06-01 13:23:49 +02:00
Even Rouault
1a4f80428d
QCAMacros.cmake: fix Linux build
25ba36180c causes
build failures on Ubuntu 16.04 and 18.04 with gcc

{{{
/usr/bin/c++    -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 -I/usr/include/Qca-qt5/QtCrypto  -fPIE   -std=gnu++11 -o CMakeFiles/cmTC_3b936.dir/qcaossl.cpp.o -c /home/even/qgis/QGIS/build/CMakeFiles/CMakeTmp/qcaossl.cpp
In file included from /usr/include/x86_64-linux-gnu/qt5/QtCore/qchar.h:37:0,
                 from /usr/include/x86_64-linux-gnu/qt5/QtCore/qstring.h:41,
                 from /usr/include/x86_64-linux-gnu/qt5/QtCore/QString:1,
                 from /usr/include/Qca-qt5/QtCrypto/qca_core.h:36,
                 from /usr/include/Qca-qt5/QtCrypto/qca.h:36,
                 from /usr/include/Qca-qt5/QtCrypto/QtCrypto:1,
                 from /home/even/qgis/QGIS/build/CMakeFiles/CMakeTmp/qcaossl.cpp:2:
/usr/include/x86_64-linux-gnu/qt5/QtCore/qglobal.h:1067:4: error: #error "You must build your code with position independent code if Qt was built with -reduce-relocations. " "Compile your code with -fPIC (-fPIE is not enough)."
 #  error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\
    ^
}}}

qtglobal.h doesn't like -fPIC and -fPIE together

See https://github.com/qgis/QGIS/pull/6093#issuecomment-393518711
2018-06-01 13:22:48 +02:00
Nyall Dawson
8bdec09b3b Revert "Fix QCA-ssl for FreeBSD"
This reverts commit 25ba36180cfbf836b9458beb98e28f62349c4260.

Breaks linux build
2018-06-01 08:32:46 +10:00
lbartoletti
25ba36180c Fix QCA-ssl for FreeBSD 2018-05-31 19:34:07 +10:00
Matthias Kuhn
29489e1056
Merge pull request #6865 from PeterPetrik/qgsquick_1_canvas_merge
[FEATURE] Introduction of QGIS Quick library
2018-05-09 07:40:01 +02:00
Tisham Dhar
83218c9eef Find Spatialindex library in osgeo4w64 bit 2018-05-08 21:10:09 +10:00
Matthias Kuhn
0cc0fedbe3
Merge pull request #6748 from Scimmia22/patch-1
Update FindQextserialport.cmake for Qt5
2018-05-07 10:59:28 +02:00
Denis Rouzaud
a34c44361d
fix PROJ_HAS_VERSION and also display version in cmake output (#6878) 2018-04-27 09:16:53 -04:00
Peter Petrik
b1bf9b2809 [FEATURE] Introduction of QGIS Quick library
This pull request is a subset of #6490

This adds a new library for creation of applications based on Qt Quick
framework.
It contains reusable QML / Qt Quick components based on QGIS core
library.
The initial work introduces MapCanvas

To enable compilation of the library, use WITH_QUICK=TRUE

Further documentation of the library is located in doc/qgsquick.dox

For background information see the associated QEP:
qgis/QGIS-Enhancement-Proposals#109

The initial implementation is largely based on the work of Matthias Kuhn
and Marco Bernasocchi on QField probject - kudos to them for the great
job!
2018-04-26 13:33:48 +02:00
Peter Petrik
50422a1165 [FEATURE] QgsMeshLayer part 1: Reading raw mesh
Introducting MDAL, QgsMeshLayer, mesh data providers (mesh_memory, mdal)
to read and visualize raw meshes: vertices and faces. Support dragging
2dm files from browser on canvas to visualize 2dm meshes.
Support for QgsMeshLayer in Python API.
2018-04-19 10:50:33 +02:00
Doug Newgard
293c56c351
Update FindQextserialport.cmake for Qt5
Find default library name used with Qt5 and checks qt subdir for header
2018-04-04 12:10:14 -05:00
Markus Neteler
2dece58b67
Add grass74 support
GRASS GIS 7.4 is the current stable version, support added
2018-02-20 12:30:24 +01:00
Juergen E. Fischer
39cb0fbfd0 proj5: show proj version qgis was built with and the version it's running with 2018-02-19 22:12:09 +01:00
Alessandro Pasotti
6eac6ac8cb [cmake] MXE build changes 2018-02-08 09:30:09 +01:00
Nyall Dawson
9553dea201 Remove more unused Qt4 cmake code 2018-02-06 22:39:42 +11:00
Nyall Dawson
3e1b99be69 Remove a bunch of Qt4 compatibility code 2018-02-06 22:39:42 +11:00
Nyall Dawson
fc16972646 Remove a bunch of unused Qt4 compatibility code 2018-02-06 22:39:42 +11:00
Jürgen Fischer
bf3d60c941
Merge pull request #6171 from landryb/fix/find-gdal-geos-postgres-libs-on-openbsd
Use FIND_LIBRARY to find GDAL, GEOS and Postgres libraries
2018-01-30 16:05:40 +01:00
lbartoletti
998c67d3ff Improve find of grass on FreeBSD 2018-01-29 03:39:06 -09:00
lbartoletti
378191d249 OpenBSD patch for PyQt5 2018-01-29 03:39:06 -09:00
lbartoletti
4c436e5d81 - Little modification to programmatically find grass version +Add
FreeBSD locale path
- Add missing includes in kpty
2018-01-29 03:39:06 -09:00
Loïc Bartoletti
8d4d08f8a0 Fix pathes for FreeBSD 2018-01-29 03:39:06 -09:00
Landry Breuil
26f8f165c4 Use FIND_LIBRARY to find GDAL, GEOS and Postgres libraries
On OpenBSD, there's no libgdal.so symlink, only a versioned library (ie
libgdal.so.X.Y where X.Y changes over time so is never constant)
Using cmake's FIND_LIBRARY allows to let cmake find the library.

Without this, the build would fail on OpenBSD:
ninja: error: '/usr/local/lib/libgdal.so', needed by 'output/lib/libqgis_core.so.18.0', missing and no known rule to make it
2018-01-25 09:30:38 +01:00
Denis Rouzaud
9c5797ec38 sip fix include directory 2018-01-22 08:15:32 -04:00
Denis Rouzaud
0644f59cde fix variable used for configuration 2018-01-17 10:16:37 -04:00
Denis Rouzaud
1d4e6a820a [sipify] use configuration file for SIP sources (*.sip.in)
to allow preprocessing the files to handle version specific features such as template based classes documentation in 4.19.7+
2018-01-17 10:16:37 -04:00
Denis Rouzaud
880d853e9f
detect SIP version to add DefaultDocstringSignature directive (#6030)
* detect SIP version to add DefaultDocstringSignature directive

SIP doesn't handle any kind of preprocessing, so there's no better solution than configuring the SIP files from CMake.
SIP 4.19.7+ supports %DefaultDocstringSignature to prepend auto-generated Python signature to existing Docstrings
2018-01-10 10:32:21 -04:00
Matthias Kuhn
bb6fda6cd6 Bump minimum spatialite version to 4.2 2017-11-16 07:57:41 +01:00
Larry Shaffer
ff2a53c584
Update PyQtMacros module to handle removal of name option from pyrcc5 2017-11-05 11:24:59 -07:00
Larry Shaffer
c66de14055 [auth] Add PKCS8 to PKCS1 key conversion for macOS (deps on libtasn1)
See description of QgsAuthCertUtils::pkcs8PrivateKey.

This fix may be needed on other platforms (untested at this point),
because Qt5 QSslkey class *still* does not directly support creation
using non-PKCS1 PEM- or DER-encoded data, though QCA, whose qca-ossl
plugin is linked to OpenSSL, does support PKCS1 and PKCS8.
2017-10-18 16:07:04 -06:00
Larry Shaffer
559973739c Merge pull request #5202 from dmarteau/fix_ln_option_OSX
Execute ln command with GNU compatible options in install phase
2017-09-21 19:37:42 -06:00
Nyall Dawson
b53e986781 Merge pull request #5170 from nyalldawson/drop_spatial_query
Drop spatial query plugin
2017-09-19 06:49:20 +10:00
Matthias Kuhn
fc561d0375
[travis] Traceback for python tests on timeout 2017-09-15 16:31:01 +02: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
Nyall Dawson
83f3a26f8e Use offline editing plugin instead of spatial query for detecting plugin path 2017-09-12 09:46:19 +10:00
Larry Shaffer
8770625db2 Fix CMake bundling error on macOS 2017-09-07 20:30:49 -06:00
Sandro Mani
14f9cd19bc [Globe] Adapt for QGIS API changes, add Qt5 compatibility, support osgEarth up to current git master 2017-09-04 20:50:58 +02:00
Alessandro Pasotti
daa60d1a0e Merge pull request #5057 from boundlessgeo/gpkg-raster-import2
Geopackage: handle raster drop in browser
2017-08-29 08:48:51 +02:00
Nyall Dawson
9b2e60ee1b Remove use of old CMP0005 CMake policy
Since it's deprecated on newer CMake versions
2017-08-29 13:37:06 +10:00
Alessandro Pasotti
83b11d5484 Minor update in the comment 2017-08-22 17:28:38 +02:00
Alessandro Pasotti
35e49ed90a Bump required GDAL version from 2.0 to 2.1
Because we need GDALTranslate()
2017-08-22 17:25:50 +02:00
Larry Shaffer
83aa1adf1e Add support for finding zipconf.h in separate location; use include dirs
LIBZIP_INCLUDE_DIRS could end up with duplicate entries, but seems to be
the simplest way of supporting headers installed to multiple locations.
2017-08-15 09:13:05 -04:00
Juergen E. Fischer
6186c0f0ff fix windows build (extern "C" can returns pointers, but not C++ containers) 2017-08-10 14:00:53 +02:00
Juergen E. Fischer
03e0298f49 msvc warning fixes:
* use AUTORCC to avoid locked qrc_images.cpp during build of gui tests
* bump minimum version of cmake to 3.0.0 for AUTORCC
* suppress some warnings in sip bindings
* suppress unreachable warnings and some more
* split sip files in more parts to suppress warning BK4504
* also remove old WITH_INTERNAL_YAML from travis
2017-08-10 00:09:14 +02:00
Blottiere Paul
5eba29e743 Add libzip as dependency 2017-07-31 11:09:14 +01:00
Juergen E. Fischer
bcc8e90640 Fix qgsversion.h creation 2017-07-17 15:26:43 +02:00
Radim Blazek
eb6301e023 [GRASS] remove GRASS 6 support 2017-07-12 17:51:03 +02:00
Harrissou Sant-anna
6fab688298 Use SpatiaLite right spelling when needed 2017-07-07 01:26:38 +02:00
Denis Rouzaud
281daee0ba run Doxygen and doc coverage test on static Travis config 2017-06-05 22:19:20 +02:00