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
4,059 Commits 82 Branches 277 Tags
Commit Graph

55 Commits

Author SHA1 Message Date
g_j_m
49945bfd78 Explicitly allow for Qt 4.2 in checks 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5747 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-09-01 11:19:43 +00:00
rblazek
183192d4c5 disabled --with-qt-pkg-config because PKG_CHECK_MODULES is not defined on many systems 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5673 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-08-08 11:50:39 +00:00
timlinux
40cc3b66ed Fix for building qgis on debian based systems where qt3-mt lib was also present and was getting linked to cause qgis to segfault. 
Update build.sh so that it now has an option to build static binary (use xstatic) - though this does not fully work on dapper as sqlite3 (and perhaps others) dont supply statically build versions of their libs in their pacakges.
Lastly, build.sh now uses --enable-static=no option when running autogen.sh so that qgis does no build or link to static versions of its own libs which speeds up compilation time.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5294 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-17 01:04:40 +00:00
wonder
6460892bd5 Qt4 detection by using pkg-config is not default anymore, to enable it, use --with-qt-pkg-config 
Added support for QtTest in pkg-config detection.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5257 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-11 09:58:33 +00:00
telwertowski
879421139e Fix Mac references to QtDesigner and QtTest; these are libraries and not frameworks. (Note: the line beginning "dependency_libs=" in $QTDIR/lib/libQtTest.la must also be disabled to avoid a Mac glibtool bug.) 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5225 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-08 06:36:02 +00:00
rblazek
47ce15ff7c mingw requires full lib name: QtTest4/QtDesigner4 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5196 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-06 13:42:23 +00:00
timlinux
090344de2a Add -lQtDesigner and relevant includes to that designer plugins can be built 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5132 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-02 20:37:56 +00:00
timlinux
a1116cc6d9 Yet another bugfix - repair typo in -lQtTest and add -lQtTest to mingw build too 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5126 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-01 11:30:14 +00:00
timlinux
15a24952d1 Fix small bug with overridden QT4_SVGINC var being overridden by QtTest 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5125 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-01 11:24:55 +00:00
timlinux
24e384bf50 Updated to support qt4 installed via apt on debian /ubuntu systems 
Added QtTest includes and libraries to build



git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5124 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-04-01 11:10:19 +00:00
rblazek
0d5e656477 reverted hack for 64bit, it was causing fail on 64bit machines and packages compiled without libdir option (default) and for mingw32 on 64bit machine 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5119 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-03-30 12:21:18 +00:00
timlinux
07508abc68 Apply Ticket #27: acinclude_m4_64bit.patch 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5110 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-03-29 16:12:10 +00:00
wonder
70bcd4886d small fix that resolves redundant compiler/linker flags from pkg-config 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5037 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-03-16 14:08:54 +00:00
wonder
b6085f65e7 Qt4 detection in configure script using pkgconfig. 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5008 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-03-12 10:14:03 +00:00
telwertowski
fefbfcd579 Add extra path info to help Mac OS X find the right Python.h and compile msexport. Previously, it was doing nothing because it found multiple directories where it expected one. 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4991 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-03-10 00:47:13 +00:00
rblazek
1e5cacc0c6 fix for crosscompilation 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4726 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-01-23 16:36:58 +00:00
morb_au
c1f961d63f Make "--with-qtdir" work better in ./configure. 
Previously if your --with-qtdir was not in your PATH, ./configure would pick up the uic that was in your path anyway.  Now uic and rcc are forced to those found inside whatever you specify with --with-qtdir.
-This line, and those below, will be ignored--

M    qgis/acinclude.m4


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4719 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-01-22 21:57:09 +00:00
g_j_m
129c3bddeb Add svg library and include stuff for Darwin 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4714 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-01-21 23:00:01 +00:00
g_j_m
426901db9c Attempt to include required stuff for Qt Svg 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4713 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-01-21 22:53:22 +00:00
rblazek
a0ffd48d0d fixes for cross compilation with MinGW 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4647 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-01-11 16:34:40 +00:00
gsherman
41dd72adfe Throw an error in configure if Qt 4.1 is not detected. 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4493 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2006-01-07 02:48:57 +00:00
gsherman
481eb106fa Merge UI conversion branch to HEAD. UI branch is now deprecated. 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4409 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-12-30 04:56:31 +00:00
gsherman
2f390c9f82 Quick change to fail configure if Qt 4 is not found. Additional cleanup 
to the Qt detection code is required to complete the migration from
version 3.x to 4.x.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4267 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-11-25 17:53:29 +00:00
telwertowski
6e8edde3b3 Add build support for Qt4/Mac. 
(The environment variable QTDIR should be defined similar to /usr/local/Trolltech/Qt-4.0.1 for Qt4 and /Developer/qt for Qt3.)


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4255 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-11-21 23:54:16 +00:00
shalasz
6403ebd7c0 Find libQtCore on Debian 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4236 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-11-20 01:55:31 +00:00
shalasz
a07b1b02aa Look for uic3 in PATH as well 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4235 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-11-20 01:37:33 +00:00
gsherman
f52ca2e9eb Added check for Qt 4.1x in addition to 4.0.x 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4231 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-11-19 05:27:48 +00:00
gsherman
dce3e64342 Python configuration changes 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4201 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-11-12 03:37:11 +00:00
gsherman
2e47b7aa35 Added support for python to the build system. Don't get too excited, 
this isn't used anywhere yet...


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4199 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-11-12 01:10:00 +00:00
morb_au
7f5677d2aa More changes for Qt4 porting readiness. 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3948 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-09-21 21:11:18 +00:00
morb_au
af0eeedab9 Initial conversion of the build system to recognise Qt4.0.0 as a build option. For example, if you've "make install"ed Qt4, you can try using ./configure "--with-qtdir=/usr/local/Trolltech/Qt-4.0.0". 
It's HIGHLY RECOMMENDED to build against Qt4 in a *copy* of your CVS working directory as you will still have to run qt3to4 from the qgis root directory (e.g. "/usr/local/Trolltech/Qt-4.0.0/bin/qt3to4 qgis.pro") before you "make", and this change is difficult to undo.

Please continue to commit new code that is Qt3.3 compatible, NOT Qt4 only.

Note that qgis doesn't actually build against Qt4 yet; this is a change to the build system only, not the code.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3809 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-08-02 21:48:54 +00:00
larsl
919200333a Changed the check for GSL so it doesn't require pkg-config 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3401 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-05-15 23:56:33 +00:00
jobi
1eb9b3329c - fixed typo 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3377 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-05-13 21:50:32 +00:00
jobi
f7fdd30fe4 Tweak of makefiles and prepared for a release. 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3376 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-05-13 21:39:20 +00:00
gsherman
48b86afaef Added message at end of configure to indicate the Qt directory that 
will be used to build QGIS. Hopefully this will remind me (and others)
to ensure minimum Qt compatibility (currently @ version 3.1.2).


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3029 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-03-25 18:59:43 +00:00
jobi
c64461c290 - fix for building on 64bit architecture 
- fixed dependencies of designer-plugin/stuff


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@2956 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2005-03-13 14:24:48 +00:00
timlinux
e804789dea Allow geos 2.x.x instead of geos 2.0.x 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@2376 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-11-29 23:05:44 +00:00
gsherman
e56ac4ab0c Applied patches from Markus and strk 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@2341 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-11-26 20:31:49 +00:00
jobi
18d2eeb41f - version detection for geos 
- display versions of geos, gdal and postgresql


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@2173 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-10-25 20:44:53 +00:00
gsherman
6659aaef5f Added test for GEOS to acinclude 
Included GEOS in configure.in


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@2148 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-10-19 05:03:44 +00:00
jobi
7db3f662ba some cosmetics 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@1709 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-06-30 09:47:40 +00:00
jobi
3062f54945 recreated ts files as there where entries of the http_server plugin in it 
updated German translation
added Chinese translation


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@1708 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-06-30 09:30:41 +00:00
jobi
7783406263 ** fixed QT detection 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@1267 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-04-25 17:23:25 +00:00
jobi
88550f0ea4 added swedish translation 
updated qgis.m4 and configure stuff


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@1225 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-04-21 14:14:41 +00:00
jobi
4ec847d71c ** Changed to simple macros for detecting QT and GDAL 
** Added code for detecting QGIS as m4 file to tools
** this will be installed together with QT and GDAL detection to
   $prefix/share/aclocal/qgis.m4
   so the plugins can just use those simple unique macros
** updated German translation
!! Developers have to link the installed qgis.m4 to /usr/share/aclocal/
!! or where ever aclocal keeps the m4 files
!! otherwise it's not detected by the plugins autogen.sh (more exactly
!! aclocal)
!! It can be cheated by adding -I path/to/qgis.m4 to the aclocal of
!! autogen.sh. But be carefull not to commit that to CVS


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@1213 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-04-18 23:44:41 +00:00
jobi
b44329a96b Changes to make QGIS work on Mac OS X, more to follow 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@1202 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-04-13 20:30:31 +00:00
gsherman
645dd5bed0 changed detection logic for qt share libs and qt multi-threaded lib 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@593 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-01-26 01:03:32 +00:00
timlinux
cff3a62802 Added support for qt3.3 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@549 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2004-01-21 11:29:46 +00:00
gsherman
8b8b20a566 update to configure to detect valid Qt version 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@323 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2003-12-10 03:54:22 +00:00
gsherman
e4bdd8ce0d tweaks to Qt detection 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@312 c8812cc2-4d05-0410-92ff-de0c093fc19c
 2003-11-30 01:37:43 +00:00