214 Commits

Author SHA1 Message Date
Nyall Dawson
c391fcd81c Avoid cmake CMP0026 warning on Win32 by replacing disallowed LOCATION
target property
2015-06-19 13:10:02 +10:00
Juergen E. Fischer
d4b72a2d7b depend on spatialite_init_ex() for 'new' spatialite initialization (followup 252aaab) 2015-05-27 20:45:15 +02:00
Radim Blazek
9e5b2ba511 [GRASS] create imagery group if there are rgb color interpretations, list groups in browser 2015-05-26 12:43:20 +02:00
Matthias Kuhn
c0090d8cfe Also let CMake find grass libs in default system location 2015-05-01 16:18:00 +02:00
Radim Blazek
7d4eb8bce3 [GRASS] multi version build 2015-04-07 11:05:10 +02:00
Matthias Kuhn
66ba219fd3 Find qwt6-qt4 library
Fix #12374
2015-03-18 18:04:35 +01:00
Juergen E. Fischer
f4b3ad033a use PyQt4 where deprecated pyqtconfig is unavailable (fixes #10596 and fixes #11465) 2015-02-25 19:32:54 +01:00
Larry Shaffer
da76270174 Add qgis.server to PyQGIS console .api file generation 2015-02-20 15:49:14 -07:00
Larry Shaffer
4b076290fe Update Mac bundling for qgis_server lib 2015-02-20 15:49:14 -07:00
Tim Sutton
e1508c1e6a Use cmake variable rather than env var for QGIS Cmake Find rules when using a custom QGIS prefix. 2015-02-19 23:44:08 +02:00
Tim Sutton
810edb7f92 Added support for finding QGIS in QGIS_PREFIX_PATH when using FindQGIS.cmake 2015-02-19 23:44:08 +02:00
Juergen E. Fischer
956c155e8f fix python pep8 warnings and fix some revealed errors
pep8 --ignore=E111,E128,E201,E202,E203,E211,E221,E222,E225,E226,E227,E231,E241,E261,E265,E272,E302,E303,E501,E701 \
     --exclude="ui_*.py,debian/*,python/ext-libs/*" \
     .
2015-02-01 20:46:47 +01:00
Denis Rouzaud
d8acc55a49 Fix Qt5 build for custom widgets 2015-01-06 17:03:27 +01:00
Larry Shaffer
a4aaff5d53 Fix CMake policy warnings/changes introduced in 3.0.0 and higher 2014-12-22 17:06:13 -07:00
Nyall Dawson
a435441239 Add support for generating coverage statistics for tests
Build option ENABLE_COVERAGE must be set. There's also a secondary
option GENERATE_COVERAGE_DOCS which requires lcov and will generate
html docs of unit test coverage.

To generate coverage, first enable the cmake options, then build
QGIS. From the build directory, run "make qgis_coverage".

You can also add command line arguments to "make qgis_coverage" which
are forwarded on to ctest. This allows for skipping failing tests
which prevent generation of coverage docs. This is done by adding
the command line argument CMD_ARGS= to the "make qgis_coverage"
command. Eg,

make qgis_coverage CMD_ARGS="-E \"PalLabeling|LocalServer|AppStartup\"

will skip tests which match the listed expressions.
2014-12-04 07:45:22 +11:00
Juergen E. Fischer
6a1e1bb668 * fix server plugin build on windows
* move src/mapserver to src/server (IMHO better name and in sync with
  python/server)
* rename cmake option WITH_MAPSERVER to WITH_SERVER
* rename define MAPSERVER_HAVE_PYTHON_PLUGINS to HAVE_SERVER_PYTHON_PLUGINS
2014-11-28 16:46:29 +01:00
Matthias Kuhn
78c519546a Add Qt5 support 2014-11-21 11:45:32 +01:00
Martin Dobias
e4ab3f2aea Merge remote-tracking branch 'rouault/use_geos_reentrant_api'
Conflicts:
	src/core/pal/layer.cpp
	src/core/qgsgeometry.cpp
	src/core/qgspallabeling.cpp
2014-09-13 19:28:25 +07:00
Juergen E. Fischer
00ca017def Fix GEOS dev detection (fixes #11081) 2014-08-30 08:09:30 +02:00
Jarl Friis
04bb461746 Finding python library on Ubuntu 14.04 64bit 2014-08-06 13:36:45 +02:00
Larry Shaffer
9a10b79354 Fix finding QScintilla for non-QT_INCLUDE_DIR install directories 2014-07-23 16:12:39 -06:00
Juergen E. Fischer
3988ad0f63 make sip bindings to qscintilla derived classes optional (replaces 7e815cad & 8f0b8987) 2014-07-23 19:03:42 +02:00
Juergen E. Fischer
1692cc36b9 cmake: report geos version with c-api header only (followup 0529f117) 2014-07-15 15:29:04 +02:00
Juergen E. Fischer
0529f117d1 cmake: report geos version 2014-07-15 13:29:19 +02:00
Nyall Dawson
e13e9f7487 Make QScintilla a required dependency 2014-07-07 21:15:41 +10:00
Salvatore Larosa
b998bb215d [cmake] removes underscore in builtin APIs file 2014-06-18 18:30:06 +02:00
Even Rouault
6354dd3a31 Use GEOS reentrant API (_r functions) and update requirement to GEOS >= 3.1.0
Currently QGIS uses the 'classic' GEOS API that uses a global context.
This can conflict with libraries that would also use the global context
and potentially finalize it whereas QGIS will still use it later.

See https://groups.google.com/forum/#!topic/spatialite-users/9YSU6c5AVQ4 for
such an example of such a recent issue with Spatialite.

The _r API is available since GEOS 3.1.0, which is already an ancient GEOS
version. For example, old-old-stable Ubuntu (Lucid 10.04) and Debian (squeeze)
ship with GEOS 3.1.0 or later.

Such move has also been done in GDAL 1.11
(http://lists.osgeo.org/pipermail/gdal-dev/2013-August/036877.html)
and MapServer 7.0 (https://github.com/mapserver/mapserver/issues/4733)

There's no easy way unfortunately to check at compile time that you don't
use the non _r API. I have patched my geos_c.h header to #ifdef that API (quite
painfull to do..). A postprocessing check can be done however with :

objdump -T output/lib/*.so | grep -v Base | grep GEOS | grep -v _r | grep -v "_ZN" | grep -v GEOSversion

It should return nothing.
2014-06-17 22:18:15 +02:00
Jürgen Fischer
1a85129a99 Merge pull request #1406 from m-kuhn/spatialite-fix
[spatialite] Update layer statistics after adding new columns
2014-06-11 18:03:57 +02:00
Juergen E. Fischer
59a8cb4d28 add library dependencies to python bindings 2014-05-22 15:05:51 +02:00
Juergen E. Fischer
581e67ebda support custom widgets in PYQT4_WRAP_UI 2014-05-22 10:17:51 +02:00
Juergen E. Fischer
018086e928 GRASS:
* don't include unistd on windows in browser
* avoid warning when grass/version.h is not found at once
2014-04-19 00:30:38 +02:00
Radim Blazek
cbee1b5219 GRASS7 vector provider 2014-04-18 10:52:57 +02:00
Matthias Kuhn
0d7204cd85 [spatialite] Update layer statistics after adding new columns
Fix #8923
2014-03-14 20:53:10 +01:00
Juergen E. Fischer
dd03dd037e FindQGIS.cmake: delimitedtextplugin moved to core - look for spatialqueryplugin 2014-02-27 15:35:14 +01:00
Juergen E. Fischer
5134ef9aba fix some deprecation warnings 2014-02-24 00:43:20 +01:00
Larry Shaffer
6d663c5f5c Ensure binaries run through install_name_tool are user-writable during bundling on Mac 2014-01-20 19:55:40 -07:00
Larry Shaffer
174577b9f9 Fix FindQScintilla module for non-standard install locations 2014-01-17 14:41:01 -07:00
Jaka Kranjc
0f8a99e550 PyQt4Macros.cmake: also check for a prefixed version of pyuic4
fixes the lookup on Arch, which has python pointing to python3
2014-01-02 23:18:47 +01:00
Jaka Kranjc
929ea30c1c cmake: also look for qwtpolar in the qwt include dir 2014-01-02 23:18:22 +01:00
Matthias Kuhn
0f52163f67 [cmake] Fix warnings.
See http://www.cmake.org/Bug/view.php?id=14441
2013-11-04 10:51:01 +01:00
Juergen E. Fischer
7ba1c4d632 fix retrieval of PYTHON_SITE_PACKAGES_DIR - broke debian builds 2013-09-13 23:05:16 +02:00
Marco Bernasocchi
b61b5b0f83 make honoring -DPYTHON_LIBRARY more solid.
as cmake --help-module FindPythonLibs states
If you'd like to specify the installation of Python to use, you should modify the following cache variables:

         PYTHON_LIBRARY             - path to the python library
         PYTHON_INCLUDE_PATH         - path to where Python.h is found

(please note it is PYTHON_INCLUDE_PATH  (deprecated) and not PYTHON_INCLUDE_DIR (new in 2.8) since we require cmake >= 2.6.2)
2013-09-10 02:23:02 +02:00
Larry Shaffer
71558e697e [Android] Update library path 2013-09-09 17:15:38 -06:00
Larry Shaffer
1942239049 [Android] Change order of finding QtMobility package so Qt isn't 'found' twice 2013-09-09 17:15:38 -06:00
Larry Shaffer
dc4628599e [pyqgis-console] Add targets and python script for generating console's QScintilla .pap file, for auto-completion
- Run 'make;make qsci-pap-src; make install' to update the default .pap file in source tree
- Run 'make;make qsci-pap-master[; make install]' for local-only .pap that overrides the default .pap (when testing new bindings)
- Update console to override default .pap if master.pap is available
- Include new qgis.core.NULL attribute defined in <src>/python/__init__.py for QPyNullVariant comparisons
- Update 11-month-old default .pap
2013-08-30 13:12:38 -06:00
Jaka Kranjc
909411ce9d FindQsci: removed the unused exception holder variable
master didn't build without that:
-- Found PyQt4 version: 4.10
  File "~/carina/Quantum-GIS/cmake/FindQsci.py", line 41
    except ImportError, e:
                      ^
SyntaxError: invalid syntax
2013-08-06 21:37:09 +02:00
Larry Shaffer
0653127dd6 Fix finding QScintilla2 lib: prefer local installs over system 2013-07-11 18:16:20 -06:00
Juergen E. Fischer
06272115d5 fix #8082 2013-06-16 21:41:58 +02:00
Juergen E. Fischer
65d3535fc5 - Quantum GIS => QGIS update
- integrate PythonConsole help into main translation
- allow referencing QGIS images in context help(viewer)
2013-05-20 16:48:51 +02:00
Tim Sutton
d2433c561d Revert "make cmake honor PYTHON_LIBRARY and find the default both in x86 (tested on ubuntu 12.10 64) and android "
This reverts commit f7f3e413b726024384235a3654d6b18d9ff073be.
2013-05-19 15:31:51 +02:00