Skip to content

Commit d70602e

Browse files
author
timlinux
committed
Dont build unit tests
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@6646 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 2616b3f commit d70602e

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

build.sh

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ then
3535
fi
3636

3737
#qt installed from source
38-
#export QTDIR=/usr/local/Trolltech/Qt-4.1.0
38+
#export QTDIR=/usr/local/Trolltech/Qt-4.2.2
39+
#export QTDIR=/opt/omg_linux_bundle/usr/
40+
3941
#qt installed from debian apt
4042
export QTDIR=/usr
4143
export PATH=$QTDIR/bin:$PATH
@@ -47,12 +49,18 @@ then
4749
# up the compilation process. See discussion on
4850
# http://logs.qgis.org/slogs/%23qgis.2006-04-15.log at 17:06:10
4951
# for additional details
52+
export PATH=/opt/omg_linux_bundle/usr/bin/:$PATH
5053
./autogen.sh $AUTOGEN_FLAGS --prefix=${1} \
5154
--enable-static=no \
52-
--enable-unittests \
5355
--with-python \
54-
--with-qtdir=$QTDIR \
55-
--with-grass=/usr/lib/grass && make && make install
56-
57-
cd tests/src
58-
./runtests.sh
56+
--with-gsl=/opt/omg_linux_bundle/usr/bin/gsl-config \
57+
--with-gdal=/opt/omg_linux_bundle/usr/ \
58+
--with-projdir=/opt/omg_linux_bundle/usr/ \
59+
--with-gdal=/opt/omg_linux_bundle/usr/bin/gdal-config \
60+
--with-qtdir=$QTDIR
61+
--with-grass=/usr/lib/grass && make && make install
62+
##--enable-unittests \
63+
#cd tests/src
64+
#./runtests.sh
65+
make
66+
make install

0 commit comments

Comments
 (0)