397 Commits

Author SHA1 Message Date
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
Simon Wells
c341d8da90 avoid conflicting geos spatialindex.h include file
correct includes for spatialindex
2018-11-21 16:13:44 +11:00
William Kyngesburye
eb37507b70 quiet cmake policy message 2018-11-18 08:47:55 -06:00
Peter Petrik
bddf8a817b minor tweaks for iOS build 2018-11-13 10:48:02 +01:00
Sandro Mani
e0c79c4574 Add EXIV2 cmake variables
Forward port from kadas-albireo
2018-11-13 07:13:36 +10:00
Juergen E. Fischer
4464089487 auto-detect name of sip module used by PyQt5 2018-10-24 13:38:03 +02:00
Salvatore Larosa
d2f51f8f8f
Merge pull request #8209 from slarosa/fix_api_file_generator
add 3d module to API file
2018-10-16 15:38:40 +02:00
Salvatore Larosa
20c9a5da33 add 3d module to API file 2018-10-16 12:52:48 +02:00
Larry Shaffer
2069dc7a97 Add qt PATH_SUFFIXES to find QScintilla2 includes; match conda-forge qt
For builds using dependencies from conda-forge, also search in qt
recipe's include path at <prefix>/include/qt
2018-10-15 16:19:22 -06:00
Larry Shaffer
81f9e6dfec
[opencl] Add FindOpenCLhpp CMake module; vendor cl2.hpp; fixup includes
CL/cl2.hpp, which the OpenCL support is based upon, is not always
included with OpenCL on some platforms, e.g. Mac, or not readily
available as a package. This work adds a CMake module specifically for
finding cl2.hpp, as installed by OpenCL-CLHPP project.

If not found, but standard OpenCL lib and headers are, the vendored
cl2.hpp in external/opencl-clhpp is used, as it needs no compilation.

- Only the cl2.hpp, license and README are vendored from OpenCL-CLHPP.

- Fix up referenced includes in other CMake targets, to ensure the
includes for OpenCL are specifically added (previously, they were
sometimes found in existing include directories of other dependencies).

- Fixup for standard FindOpenCL module not assinging proper framework
headers directory for Mac.
2018-09-30 20:05:12 -06:00
Martin Dobias
031acd0dd3 Fix search path for qmlplugindump tool
CMake kept picking up the binary from /usr/bin which belongs to Qt4 installation.
Here we require CMake to use the binary from Qt5 installation that is being used.
2018-07-26 21:36:14 +02:00
Gianfranco Costamagna
9f050629c8 FindSIP: use new sip_module_dir variable (#7370)
* 0vars.cmake, FindSIP: Update to save new sip_module_dir variable
sip4 has changed sip_mod_dir to sip_module_dir.
Store the variable for later usage

* Use only new MODULE_DIR sip variable
2018-07-06 13:34:29 +02:00
Denis Rouzaud
7a68002619
leave comment for SIP version 2018-06-29 09:01:57 +02:00
Juergen E. Fischer
d1aa949d02 fix build 2018-06-28 23:05:51 +02:00
Denis Rouzaud
98bce5b734
fix findSIP when SIP >= 4.19.10 (#7329) 2018-06-28 22:22:25 +02:00
Juergen E. Fischer
212cffcab1 Port gps support to QSerialPort (byebye QExtSerialPort) 2018-06-28 17:31:01 +02:00
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