Skip to content
Permalink
Browse files
Windows build cross-compiling (from Linux) improvements:
* If postgres is not requested in the autogen/configure, do not attempt to build the geoprocessing and spit plugins (they have no meaning if postgres is not available).

* Rearrange the acinclude (configure) test for the Qt version so that the Qt/Windows version is tested first.  This resolves an issue when the Qt/Windows library is mounted on the linux compiler platform as smbfs, where case-insensitive matching was triggered; therefore allowing the Qt/Windows-style includes to be mis-detected as Qt/X11-style includes.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5830 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
morb_au committed Sep 16, 2006
1 parent 410781c commit d6d5a76025a2cd3932db7f0e536a5ee8d56d5140
Showing with 18 additions and 11 deletions.
  1. +10 −6 acinclude.m4
  2. +8 −5 src/Makefile.win
@@ -153,17 +153,21 @@ AC_MSG_RESULT([$QTDIR])
# TODO: Use sed instead of perl
QTDIR=`echo $QTDIR | perl -p -e 's/\\\\/\\//g'`
# Check for QT includedir
if test -f $QTDIR/include/qt/qglobal.h; then
# Check for QT includedir
# Test for the Windows version first because if if QTDIR is mounted via
# smbfs to an actual Windows installation, the /include/Qt is found
# case-insensitively
if test -f $QTDIR/include/Qt/qglobal.h -a -f $QTDIR/src/corelib/global/qglobal.h; then
# Windows: $QTDIR/include/Qt/qglobal.h includes $QTDIR/src/corelib/global/qglobal.h
QTINC=$QTDIR/include
QTVERTEST=$QTDIR/src/corelib/global/
elif test -f $QTDIR/include/qt/qglobal.h; then
QTINC=$QTDIR/include/qt
QTVERTEST=$QTDIR/include/qt
elif test -f $QTDIR/include/qt4/Qt/qglobal.h; then
QTINC=$QTDIR/include/qt4
QTVERTEST=$QTDIR/include/qt4/Qt
elif test -f $QTDIR/include/Qt/qglobal.h -a -f $QTDIR/src/corelib/global/qglobal.h; then
# Windows: $QTDIR/include/Qt/qglobal.h includes $QTDIR/src/corelib/global/qglobal.h
QTINC=$QTDIR/include
QTVERTEST=$QTDIR/src/corelib/global/
elif test -f $QTDIR/include/Qt/qglobal.h; then
QTINC=$QTDIR/include
QTVERTEST=$QTDIR/include/Qt
@@ -17,18 +17,21 @@ WINSUBDIRS = core legend raster composer \
providers/delimitedtext \
plugins/north_arrow \
plugins/copyright_label \
plugins/geoprocessing \
plugins/scale_bar \
plugins/georeferencer \
plugins/grid_maker \
plugins/delimited_text \
plugins/gps_importer \
plugins/spit

plugins/gps_importer

ifneq ($(PG_LIB),)
WINSUBDIRS += plugins/geoprocessing
WINSUBDIRS += plugins/spit
endif

ifneq ($(GRASS_BASE),)
WINSUBDIRS += providers/grass plugins/grass
endif

ifneq ($(PG_LIB),)
WINSUBDIRS += providers/postgres
endif

0 comments on commit d6d5a76

Please sign in to comment.