51 Commits

Author SHA1 Message Date
jef
6411c7f437 remove unnecessary linkages
git-svn-id: http://svn.osgeo.org/qgis/trunk@12273 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-11-28 16:02:15 +00:00
jef
44b7fd348a fix more line endings
git-svn-id: http://svn.osgeo.org/qgis/trunk@11650 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-09-13 10:49:37 +00:00
jef
fdc629ce5d improve nmake detection
git-svn-id: http://svn.osgeo.org/qgis/trunk@11443 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-08-19 19:09:10 +00:00
jef
da17b5de19 fix bison cmake detection
git-svn-id: http://svn.osgeo.org/qgis/trunk@11429 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-08-18 14:49:11 +00:00
jef
2d920f24a8 cmake improvements
git-svn-id: http://svn.osgeo.org/qgis/trunk@11424 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-08-18 11:59:43 +00:00
jef
95ca955748 remove tons of pyuic4, pyrcc4 generated files and create them when building (apply #1877)
git-svn-id: http://svn.osgeo.org/qgis/trunk@11401 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-08-16 22:40:48 +00:00
jef
2b5663083b more cleanups:
- don't link GSL's CBLAS. We don't use it.
- don't link GEOS and GDAL into python bindings. They don't use them directly.
- link libdl on unix when internal spatialite is used
- update SONAMEs
- fix some warnings and typos



git-svn-id: http://svn.osgeo.org/qgis/trunk@11250 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-08-02 15:28:05 +00:00
jef
f112adffef unload plugins before terminating after taking a snapshot
git-svn-id: http://svn.osgeo.org/qgis/trunk@11168 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-07-24 12:32:21 +00:00
rugginoso
59750316e6 Changed some grass modules to work with grass 6.4 and guarantee the compatibility with previous versions. Fixed #1629.
git-svn-id: http://svn.osgeo.org/qgis/trunk@10903 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-06-11 11:54:43 +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
jef
1bfc5c6adb detect iconv on macosx
git-svn-id: http://svn.osgeo.org/qgis/trunk@10488 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-06 18:24:57 +00:00
jef
f575d7cd24 missed a file in last commit
git-svn-id: http://svn.osgeo.org/qgis/trunk@10475 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-05 11:11:19 +00:00
esseffe
38f81229f0 supporting the SpatiaLite Data Provider
2009-04-24 Sandro Furieri <a.furieri@lqt.it>


git-svn-id: http://svn.osgeo.org/qgis/trunk@10414 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-03-24 20:52:12 +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
93fc3c9eb6 fix postgres <8.3 support
git-svn-id: http://svn.osgeo.org/qgis/trunk@9943 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-01-08 00:05:23 +00:00
timlinux
f10517fdfd Patch from strk to specify minimum gdal of 1.4
git-svn-id: http://svn.osgeo.org/qgis/trunk@9672 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-11-19 20:10:33 +00:00
wonder
5971fedc70 Set SIP minimal version to 4.7 (needed at least on OSX to support universal builds)
git-svn-id: http://svn.osgeo.org/qgis/trunk@9622 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-11-11 14:33:01 +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
3d92641d3e Add GRASS-6.3 to the Mac GRASS search paths.
git-svn-id: http://svn.osgeo.org/qgis/trunk@8405 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-07 04:59:30 +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
a46a0147f3 Fix include search path when using LIB_DIR on msvc with prepackaged libs
git-svn-id: http://svn.osgeo.org/qgis/trunk@8284 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-03-26 21:07:02 +00:00
timlinux
7891b11721 Fix error in sqlite find path
git-svn-id: http://svn.osgeo.org/qgis/trunk@8235 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-03-17 17:49:58 +00:00
timlinux
29b32feebb 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@8225 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-03-16 02:31:35 +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
59a5eb0bb0 Added some logic to allow libs and headers in non default locations to be used with priority over those in default locations (/usr and /usr/local)
git-svn-id: http://svn.osgeo.org/qgis/trunk@8195 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-03-08 03:23:05 +00:00
timlinux
9017fc085e Fix path issues for mingw detection of gsl deps
git-svn-id: http://svn.osgeo.org/qgis/trunk@7686 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-11-30 01:25:26 +00:00
timlinux
852421f349 Patch from Mateusz Loskot to allow easily using FWTools install of gdal
Ticket #821: cmake-findgdal-fwtools.patch


git-svn-id: http://svn.osgeo.org/qgis/trunk@7636 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-11-21 19:06:39 +00:00
timlinux
322558c99f Find postgresql libs when they are in the qgislibs archive and LIB_DIR os set (MSVC)
git-svn-id: http://svn.osgeo.org/qgis/trunk@7633 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-11-21 18:18:45 +00:00
jef
644c7c8b77 more portable GRASS detection
git-svn-id: http://svn.osgeo.org/qgis/trunk@7397 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-11-13 20:06:02 +00:00
jef
122259d50a build grass dlls from sources for msvc
git-svn-id: http://svn.osgeo.org/qgis/trunk@7363 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-11-10 00:52:01 +00:00
wonder
7ef349032e Improved SIP and PyQt4 detection.
Now it's able to detect whether python-sip4-dev and python-qt4-dev packages are missing.


git-svn-id: http://svn.osgeo.org/qgis/trunk@7273 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-10-13 17:19:26 +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
timlinux
2a2c645c24 Added some extremely clever logic so gdal headers on Gutsy Gibbon are located properly
git-svn-id: http://svn.osgeo.org/qgis/trunk@7161 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-08-28 03:52:38 +00:00
wonder
47d2a31c36 Hide LIBRARY_OUTPUT_PATH and LIB_PATH
git-svn-id: http://svn.osgeo.org/qgis/trunk@6883 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-04-12 12:20:05 +00:00
homann
0052294025 Fixed another ELSIF error
git-svn-id: http://svn.osgeo.org/qgis/trunk@6696 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-02-25 14:16:15 +00:00
homann
297fe1db7d Fix GDAL discover on non-Apple
git-svn-id: http://svn.osgeo.org/qgis/trunk@6692 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-02-24 15:07:53 +00:00
wonder
c2ecff889a Fixed GRASS configuration on Windows
git-svn-id: http://svn.osgeo.org/qgis/trunk@6656 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-02-22 11:46:40 +00:00
timlinux
c9746a4a78 For mac use dylib instead of .so for default libgdal and libpq extensions
git-svn-id: http://svn.osgeo.org/qgis/trunk@6644 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-02-20 23:23:21 +00:00
timlinux
515917c204 Fix search path for python on mac
git-svn-id: http://svn.osgeo.org/qgis/trunk@6643 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-02-20 23:06:46 +00:00
telwertowski
df975a8d80 On Mac, search for util.h instead of pty.h
git-svn-id: http://svn.osgeo.org/qgis/trunk@6525 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-02-05 01:13:20 +00:00
wonder
a456530777 CMake: added check to accept Bison 2.0 or higher
(it's known not to work correctly with 1.28)


git-svn-id: http://svn.osgeo.org/qgis/trunk@6524 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-02-04 21:38:25 +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
7ca9093073 CMake: add default search paths on Mac for SIP
git-svn-id: http://svn.osgeo.org/qgis/trunk@6520 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-02-04 13:41:41 +00:00
wonder
880a93a220 CMake:
- search for GDAL and GSL also in /usr/local
- added mac-specific locations for GDAL and GRASS


git-svn-id: http://svn.osgeo.org/qgis/trunk@6515 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-02-04 12:11:30 +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
617f524228 CMake:
- added possibility to explicitly disable building of bindings
- added version checks for SIP (min. 4.5) and PyQt (min. 4.1)


git-svn-id: http://svn.osgeo.org/qgis/trunk@6428 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-01-13 14:35:53 +00:00
wonder
f6c89dddc6 - CMake: improved search for GRASS
- removed Makefiles commited by mistake some time ago


git-svn-id: http://svn.osgeo.org/qgis/trunk@6419 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-01-09 23:23:56 +00:00