summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2015-04-07 18:43:38 -0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-04-07 16:27:39 -0700
commitfe37ce02d1769c5c195bc1f215047a0c373ad902 (patch)
treefda03ded1995fac3a9b03705c32a6d4594f4c573 /scripts
parentc2bdc58fb8d9731fdbc3889017e8a7991da73ce9 (diff)
downloadsubsurface-fe37ce02d1769c5c195bc1f215047a0c373ad902.tar.gz
Small changes to the build-script
- libgits version bump to 0.22 (0.21.5 didn't worked here) - call cmake in build.sh instead of qmake. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/build.sh b/scripts/build.sh
index 9ea0f4f76..12b62257b 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -45,7 +45,7 @@ if [ ! -d libgit2 ] ; then
fi
fi
cd libgit2
-git checkout v0.21.5
+git checkout v0.22.0
mkdir -p build
cd build
cmake -DCMAKE_INSTALL_PREFIX=$SRC/install -DCMAKE_BUILD_TYPE=Release -DBUILD_CLAR=OFF ..
@@ -97,6 +97,8 @@ make -j4
make install
cd $SRC/subsurface
-$QMAKE CONFIG+=setRpath LIBDCDEVEL=1 LIBMARBLEDEVEL=$SRC/install SPECIAL_MARBLE_PREFIX=1 LIBGIT2DEVEL=$SRC/libgit2 subsurface.pro
+mkdir -p build
+cd build
+cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$SRC/install ..
make -j4