From fe37ce02d1769c5c195bc1f215047a0c373ad902 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Tue, 7 Apr 2015 18:43:38 -0300 Subject: 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 Signed-off-by: Dirk Hohndel --- scripts/build.sh | 6 ++++-- 1 file 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 -- cgit v1.2.3-70-g09d2