sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
25,368 Commits 82 Branches 277 Tags
Commit Graph

197 Commits

Author SHA1 Message Date
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
Marco Bernasocchi
f7f3e413b7 make cmake honor PYTHON_LIBRARY and find the default both in x86 (tested on ubuntu 12.10 64) and android 2013-05-19 15:17:55 +02:00
Tim Sutton
cf928a5672 Revert "make cmake honor PYTHON_LIBRARY" 
This reverts commit b3c6d38ffefa9db79932be234b010598a9664706.
 2013-05-19 13:47:02 +02:00
Marco Bernasocchi
b3c6d38ffe make cmake honor PYTHON_LIBRARY 2013-04-23 18:26:18 +02:00
Pirmin Kalberer
1436056f77 Globe: Fix compilation with osgearth 2.4 2013-04-08 23:54:29 +02:00
Juergen E. Fischer
22cb38b2cc deduce plugin directory from a plugin that actually still exists 2013-04-07 23:14:24 +02:00
Juergen E. Fischer
82a36f9cbe adjustments to build on cygwin 2013-04-06 18:30:28 +02:00
William Kyngesburye
67a542bfd0 add framework path to link test to fix OS X SDK problem 2013-04-02 20:54:57 -05:00
William Kyngesburye
87572f72e8 add framework path to link test to fix OS X SDK problem 2013-04-02 17:48:21 -05:00
William Kyngesburye
2f2ca9f405 unset temporary LIB_PATH var 2013-04-02 14:30:52 -05:00
William Kyngesburye
a0e9f89854 handle spaces in install_names (for real this time) 2013-04-01 16:53:58 -05:00
William Kyngesburye
e31d4a2058 handle spaces in install_names 2013-04-01 16:42:43 -05:00
Juergen E. Fischer
f2029b4ec4 log python warnings and enabled deprecation warnings 2013-01-24 03:08:20 +01:00
Jaka Kranjc
5003c465d0 FindQwt.cmake: also detect qwt6 suffixes 2013-01-10 20:13:50 +01:00
Juergen E. Fischer
e2f7adf2fb geos 3.3.6 doesn't produces geos_c_i on windows anymore also check geos_c 2012-12-29 02:56:24 +01:00
Larry Shaffer
d56b1c885f Add CMake option for custom Python framework on Mac 2012-12-22 15:37:14 -07:00
Juergen E. Fischer
56bba0609e remove trailing whitespace 2012-12-05 22:14:16 +01:00
Werner Macho
8c32fe97e5 add missing FindQextserialport.cmake to complete issue #6613 2012-12-05 11:49:35 +01:00