sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-24 00:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
88,971 Commits 84 Branches 277 Tags
Commit Graph

40 Commits

Author SHA1 Message Date
Nyall Dawson
6785fe4554 [cmake] Use execute_process instead of deprecated EXEC_COMMAND 
See CMP0153
 2024-04-21 12:52:02 +10:00
Matthias Kuhn
2c8e784625
Use geos cmake configuration (#54659) 2023-09-19 20:10:15 +00:00
Nyall Dawson
a5e66c3765 Bump minimum GEOS to version 3.9 2022-08-30 12:51:29 +10:00
Sam Gillingham
a2bc59798f don't search for C++ GEOS lib with MSVC 2021-02-04 23:20:55 +01:00
Peter Petrik
62bcc92339
MacOS CI (#35407) 
[infrastructure] [macos] use QGIS-Mac-Packager dependencies to setup MacOS CI build with GitHub workflows. Use CMake's define QGIS_MAC_DEPS_DIR to define folder to dependencies
 2020-04-05 10:51:00 +02: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
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
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
Nyall Dawson
616a80f48e Bump minimum GEOS version to 3.3 2016-08-17 06:43:02 +10:00
Sandro Mani
643eb1000d Remove GEOS C++ lib dependency 2015-10-07 23:33:56 +02:00
Sandro Mani
9fef5a16ae Make GEOS CPP optional 2015-09-21 10:03:25 +02:00
Larry Shaffer
a4aaff5d53 Fix CMake policy warnings/changes introduced in 3.0.0 and higher 2014-12-22 17:06:13 -07: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
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
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
Juergen E. Fischer
06272115d5 fix #8082 2013-06-16 21:41:58 +02:00
Juergen E. Fischer
82a36f9cbe adjustments to build on cygwin 2013-04-06 18:30:28 +02: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
Juergen E. Fischer
3b3f6748f1 remove CMAKE_BUILD_TYPE dependency on windows 2012-08-06 10:12:38 +02:00
William Kyngesburye
a917265c4e add missing version numbers to Mac framework detection 2011-05-28 21:49:38 -05:00
kyngchaos
0aa434a32c Fix empty _LIBRARY left from framework check when fw not found 
git-svn-id: http://svn.osgeo.org/qgis/trunk@14984 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2010-12-30 23:45:23 +00:00
kyngchaos
a077527876 fix detection logic, remove unused setting 
git-svn-id: http://svn.osgeo.org/qgis/trunk@14460 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2010-10-30 22:54:08 +00:00
kyngchaos
be17b00e09 Mac cmake update: 
cleaner framework detection;
optional bundle Qt/PyQt and libraries, and fixup paths

git-svn-id: http://svn.osgeo.org/qgis/trunk@14458 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2010-10-30 19:37:00 +00:00
jef
1fdd283b6d update install/build documentation & cmake updates: 
- split install document into multiple files
- reorder chapters
- update msvc part (shortend add reference to OSGeo4W dependencies)
- update CMake files to look in $ENV{LIB} and $ENV{INCLUDE}


git-svn-id: http://svn.osgeo.org/qgis/trunk@14440 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2010-10-27 23:58:43 +00:00
wonder
3925a0892d Added copyright notices to CMake modules, BSD license has been set to the modules (typical license for CMake modules). 
git-svn-id: http://svn.osgeo.org/qgis/trunk@13756 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2010-06-20 17:09:21 +00:00
wonder
5450e64b07 For 1.1 release we need geos 3.0.0 or later so make sure the user has it. 
GEOS 3 is required by PAL, simplify method of QgsGeometry and probably also spatialite.


git-svn-id: http://svn.osgeo.org/qgis/trunk@10562 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2009-04-14 12:54:07 +00:00
timlinux
975d2d4e11 Tweaks to make cmake find the sqlite3, pq, gdal and geos dependencies when using LIB_DIR and osgeo4w dependencies 
git-svn-id: http://svn.osgeo.org/qgis/trunk@10288 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2009-03-17 11:42:50 +00:00
jef
4b46398bc4 astyle re-indentation & iostream=>QgsDebugMsg migration cleanup 
git-svn-id: http://svn.osgeo.org/qgis/trunk@9138 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2008-08-23 21:37:31 +00:00
jef
c2c6974259 apply patch #1229 from mloskot 
git-svn-id: http://svn.osgeo.org/qgis/trunk@9105 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2008-08-21 06:54:20 +00:00
jef
935d5666e6 QgsGeometry migrated to GEOS C-API 
git-svn-id: http://svn.osgeo.org/qgis/trunk@9093 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2008-08-20 12:31:37 +00:00
telwertowski
cd2c6b0f32 Search CMake default standard locations rather than explicitly encoding standard locations into files. On a Mac, the standard locations may also include framework paths and the frameworks need to be searched either first or last depending upon other CMake settings. 
git-svn-id: http://svn.osgeo.org/qgis/trunk@8404 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2008-05-07 04:57:13 +00:00
timlinux
9b5f9c3672 Added the possibility to use these libs from non default locations by specifying them in LIB_DIR. Before this change, the presence of the lib in /usr or /usr/local would override command line specified paths 
git-svn-id: http://svn.osgeo.org/qgis/trunk@8203 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2008-03-10 16:08:43 +00:00
timlinux
dcd52f1281 For msvc cmake rules make all the include, app and lib paths relative to the environment dir %LIB_DIR% so that the libs can be anywhere on your filesystem. 
git-svn-id: http://svn.osgeo.org/qgis/trunk@7261 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2007-10-11 18:06:07 +00:00
timlinux
b720ac5330 Added clauses to find dependencies under MSVC. I will be making a zip file with file with all deps for streamlining the dev environment setup process 
git-svn-id: http://svn.osgeo.org/qgis/trunk@7236 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2007-10-01 00:13:34 +00:00
homann
9488c74b1e Fix CMake search for libraries 
git-svn-id: http://svn.osgeo.org/qgis/trunk@6522 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2007-02-04 15:14:51 +00:00
wonder
c7d894cfa2 Added convenience paths for dependency search on windows (expecting c:/msys) 
git-svn-id: http://svn.osgeo.org/qgis/trunk@6453 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2007-01-23 23:22:19 +00:00
wonder
46a2d125a2 Merged refactoring branch back to trunk. 
git-svn-id: http://svn.osgeo.org/qgis/trunk@6415 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2007-01-09 02:39:15 +00:00