69 Commits

Author SHA1 Message Date
timlinux
3705726a56 Mark as preview 1
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9375 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-09-22 19:17:12 +00:00
jef
5661eef995 astyle re-indentation & iostream=>QgsDebugMsg migration cleanup
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9138 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-08-23 21:37:31 +00:00
jef
2e5506a267 various code cleanups by mloskot for GCC 4.1 (fixes #1239, #1240).
Inspired by it I also enabled pedantic mode for MSVC and cleaned
up some more warnings found by GCC 4.3 and MSVC.




git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9133 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-08-23 14:06:01 +00:00
timlinux
c244ca22b1 Updated splash and compressed master so it requires less space in svn checkout. Updated version name in cmakelists
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9104 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-08-20 21:27:54 +00:00
timlinux
1fee765514 Made new splash and version number so trunk can be distinguished from 0.11.0 branch easily
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8770 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-07-14 13:16:13 +00:00
timlinux
488aee5bd0 Fix for ticket #1047
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8739 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-07-08 20:41:42 +00:00
telwertowski
8527da791a Remove use of Qt3 support inline routines which redirect old Qt3 names to new Qt4 names. Remove USE_QT3SUPPORT from top-level CMakeLists and add it to GRASS provider/plugin CMakeLists so that all use of Qt3 names and libraries is limited to these two directories.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8630 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-06-09 03:30:50 +00:00
jef
8b355f3b04 fix python fix
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8539 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-28 21:51:05 +00:00
jef
238ef96fd6 fix building python plugin on windows
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8536 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-28 19:49:14 +00:00
timlinux
edf3169b30 remove superfluous ^ symbol
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8523 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-26 15:42:29 +00:00
timlinux
9581b29b23 remove some duplication of version vars in top level cmakelists.txt
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8519 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-26 14:16:03 +00:00
timlinux
bca65ebbaa Dont use PREFIX on linux (or anywhere else). On linux assume prefix is appdirpath/.
This fixes issues where qgis is nor relocatable after building, and removes cmake warnings about duplicate definition of PREFIX. Note that to be relocatable you should not build using rpath support..


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8472 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-19 20:52:54 +00:00
jef
ef045931ad revert r8437 and fix it different
- use FIND_PACKAGE(Qt4 REQUIRED) before SET(QT_... 1)
  as cmake's Modules/FindQt4.cmake suggests
- should also fix #913


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8438 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-14 22:14:36 +00:00
timlinux
99275bb1db Enable qtsql module
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8434 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-14 18:15:40 +00:00
timlinux
0e08694cd0 Changed release name to Metis
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8432 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-14 13:05:09 +00:00
timlinux
c8212b2050 Changed version to 0.11.0 for trunk
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8423 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-12 13:49:00 +00:00
telwertowski
4b45366ad0 Remove all use of Qt3 compatibiliy routines except for the GRASS provider/plugin. Automatic casts of QString to char* have also been removed for compatibility with Qt/Mac-Cocoa (64-bit).
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8406 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-07 05:15:58 +00:00
timlinux
7500ab6494 Updated version to 0.10.0 since this release will contain new features as well as bug fixes. I've also softcoded the places that had release numbers hard coded in various points in the code, so setting the version no in top level CMakeLists.txt should 'trickle down' into most places where version numbers need to be set.
Made some small changes to whats new too.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8361 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-04-17 12:35:32 +00:00
jef
8cc505f7d7 debian packaging update
- update for next release
- removed some temporary files in debian/
- add version number to shared libraries names and split them into
   libqgis-core0.9, libqgis-gui0.9 and libqgisgrass0.9 (fixes #36)
- split python binding and plugins into separate package python-qgis
- merge some changes from the DebianGIS repository
- build in debian/build
- updated menu and icon
- use qgis man pages (qgis_help added)
- build on Debian unstable is lintian clean (may fix #1028)
- build also tested on OSX (Tim Sutton), MinGW (Marco Pasetti) and with MSVC


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8351 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-04-14 21:30:22 +00:00
timlinux
857da2ea46 Fix for msvc so python parts build with nmake not vcexpress
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8288 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-03-27 13:08:30 +00:00
timlinux
a1008e1dd0 Defined application services linkage for mac since we dont just globally link to all qgis libs now (which used to give us ap services libs in the process). Applies to OS X only.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8279 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-03-26 03:03:44 +00:00
timlinux
e31e8a3eda Added the option (off by default) to build with an internal copy of sqlite3. This is the recommended approach by the author of sqlite3, but the old way (linking to an external lib) remains default for now. To use add -DWITH_INTERNAL_SQLITE3 to cmake command line
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8236 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-03-17 18:45:07 +00:00
timlinux
ff1b348b90 Changed project to 0.9.2 (removing rc1)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8224 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-03-15 14:25:44 +00:00
timlinux
b211eaf2d7 Added clauses (not enabled by default) to not build any parts of code base requiring grass or pg support.Before this change it was not possible to disable them building if you did have pg grass on your system because when the cmake rules found them to be present it assumes you want to build with them. This may not always be the case. Note that if you disable them you have to do it explicitly before CMakeCache.txt is generated: e.g. -DWITH_GRASS=OFF -DWITH_POSTGRESQL=OFF otherwise the default behaviour is to build if those libs are present (as it was before this commit)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8202 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-03-10 16:05:55 +00:00
timlinux
4a8e6826be Fix for if WITH_BINDINGS is off but python was found, cmake was still trying to build python stuff.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8185 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-02-28 19:19:57 +00:00
timlinux
adc6b00f67 More version updates for impending 0.9.2rc1 release
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8073 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-01-29 02:49:50 +00:00
jef
6ae8f26aef revert some changes from r7926, which break building debian packages
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7942 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-01-12 21:05:19 +00:00
gsherman
dcabe173a8 Merge of raster transparency branch
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7926 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-01-11 06:38:10 +00:00
timlinux
a6edadd994 Merge renderer branch to trunk r7761:7920
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7922 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-01-10 22:38:05 +00:00
timlinux
536512e370 Changed project version to qgis 0.9.2
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7869 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-01-08 14:26:31 +00:00
timlinux
5cb3115957 Install INSTALL and CODING documents
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7725 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-12-07 03:08:37 +00:00
timlinux
36f261a52a Initial unit test for raster layer class
Includes a simple 10x10 raster supplied by Enrico Chiaradia


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7649 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-11-23 14:51:24 +00:00
wonder
aaa9ddf340 Library install directory made configurable (using QGIS_LIB_DIR)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7456 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-11-18 18:41:32 +00:00
wonder
a469913c89 - removed PKGDATAPATH and PLUGINPATH definitions: use QgsApplication instead
- use QgsApplication to detect data path in help viewer and mapserver export


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7455 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-11-18 18:08:01 +00:00
wonder
465d54e419 Moving towards more flexible layout of QGIS installation.
Now it's possible to set QGIS_*_SUBDIR variables in CMake that will determine
the layout of directories for executables, plugins, data, headers and manuals.

These variables are intended to be used by distributors and not ordinary
users thus they're marked as advanced.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7454 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-11-18 17:41:45 +00:00
jef
6c7b75d998 begin packaging msvc build using CPack
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7351 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-11-07 14:54:09 +00:00
jef
e12e8bca7a fixed cmake typo for windows installer
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7336 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-11-06 13:19:06 +00:00
timlinux
8cbfbd34e3 Updated version number to 0.9.1
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7319 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-11-04 23:31:15 +00:00
timlinux
5cb41238e6 Patched in Jürgens MSVC logger improvements.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7311 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-11-01 10:23:54 +00:00
timlinux
76044da92c Fix for trying to call winmain instead of main when compiled with msvc. Link to qtmain when building with msvc (fixes crash on app start up when building in release mode). Dont show console when building on win.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7256 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-10-09 15:57:59 +00:00
timlinux
c7dba658e7 Applied patch from David Willis for msvc/win32 build support
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7226 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-09-27 19:41:16 +00:00
timlinux
836c5bfac0 Updated ts files
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7157 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-08-27 23:29:28 +00:00
timlinux
a778e1da5e Merged in changes from the 0.9.0preview1 tag back to trunk. Please make all changes directly in trunk.
svn merge -r 7108:7129 https://svn.qgis.org/repos/qgis/tags/Preview-0.9.0-1


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7130 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-08-09 04:06:41 +00:00
timlinux
ed58adf9e5 Disable pedantic for preview 1
Make pedantic warnings only appear when pedantic is on


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7099 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-07-26 03:20:16 +00:00
timlinux
466a4a15a5 Tidy up cmake stuff so all .in files now live under cmake_templates
Move more utility scripts into scripts dir



git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7097 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-07-25 21:28:00 +00:00
timlinux
4e8c14e3d1 Set version name to 0.9.0preview1 for project name and in nsis config
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6988 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-06-09 04:12:36 +00:00
timlinux
6da550da61 Initial CPack directives
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6979 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-06-04 19:20:08 +00:00
timlinux
a1b7d7f246 Simple test case working built by cmake
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6951 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-05-21 20:42:37 +00:00
timlinux
50f8995546 Initial commits to build qtests from cmake / ctest. Non functional yet
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6949 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-05-21 17:28:53 +00:00
wonder
674e1f919f Hide LIBRARY_OUTPUT_PATH and LIB_PATH
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6883 c8812cc2-4d05-0410-92ff-de0c093fc19c
2007-04-12 12:20:05 +00:00