From 939ea577d3dc9a32a284f164c336284f8a0beb3f Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Fri, 29 Nov 2013 01:34:56 +1000
Subject: [PATCH] Quieter cmake. Stop it spamming ' -- Installing' messages. We
 know it is installing assets. Also make travis a bit quieter.

---
 .travis.yml         | 13 ++++++++-----
 Blackberry/build.sh |  2 +-
 b.sh                |  7 +++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6cf0fff51c..0988d82c0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,12 +13,16 @@ compiler:
 
 before_install:
   - git submodule update --init --recursive
-  - sudo add-apt-repository -y ppa:ubuntu-sdk-team/ppa && sudo apt-get update && sudo apt-get install cmake lib32z1-dev lib32stdc++6
+  - sudo apt-get install lib32z1-dev lib32stdc++6 -qq
+# Travis uses CMake 2.8.7. We require 2.8.8. Grab latest
+  - wget http://www.cmake.org/files/v2.8/cmake-2.8.12.1-Linux-i386.sh
+  - chmod a+x cmake-2.8.12.1-Linux-i386.sh
+  - sudo ./cmake-2.8.12.1-Linux-i386.sh --skip-license --prefix=/usr
 # Linux Setup
-  - if [ "$PPSSPP_BUILD_TYPE" == "Linux" ]; then sudo apt-get install libsdl1.2-dev; fi
+  - if [ "$PPSSPP_BUILD_TYPE" == "Linux" ]; then sudo apt-get install libsdl1.2-dev -qq; fi
 # Android NDK
   - if [ "$PPSSPP_BUILD_TYPE" == "Android" ]; then
-      sudo apt-get install openjdk-7-jdk ant &&
+      sudo apt-get install openjdk-7-jdk ant -qq &&
       wget --timeout=30 http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -O ndk.tar.bz2 &&
       tar -xf ndk.tar.bz2 &&
       export ANDROID_HOME=$(pwd)/android-ndk-r9 NDK=$(pwd)/android-ndk-r9;
@@ -31,8 +35,7 @@ before_install:
       tar -xf libs.tar.gz &&
       wget --timeout=30 ${BB_NDK}tools.10.2.0.15.tar.gz -O tools.tar.gz &&
       tar -xf tools.tar.gz &&
-      QNX_TARGET="$(pwd)/target_10_2_0_1155/qnx6" && QNX_HOST="$(pwd)/host_10_2_0_15/linux/x86" && MAKEFLAGS="-I$QNX_TARGET/usr/include" LD_LIBRARY_PATH="$QNX_TARGET/armle-v7/lib/:$QNX_HOST/usr/lib/:$LD_LIBRARY_PATH" && PATH="$QNX_HOST/usr/bin:$PATH" &&
-      export QNX_TARGET QNX_HOST MAKEFLAGS LD_LIBRARY_PATH PATH;
+      export QNX_TARGET="$(pwd)/target_10_2_0_1155/qnx6" QNX_HOST="$(pwd)/host_10_2_0_15/linux/x86" MAKEFLAGS="-I$QNX_TARGET/usr/include" LD_LIBRARY_PATH="$QNX_TARGET/armle-v7/lib/:$QNX_HOST/usr/lib/:$LD_LIBRARY_PATH" PATH="$QNX_HOST/usr/bin:$PATH";
     fi
 
 script:
diff --git a/Blackberry/build.sh b/Blackberry/build.sh
index b69584f4cc..17ab8f6ff3 100755
--- a/Blackberry/build.sh
+++ b/Blackberry/build.sh
@@ -11,7 +11,7 @@ if [[ "$1" == "--simulator" ]]; then
 	SIM="-DSIMULATOR=ON"
 fi
 
-cmake ${SIM} -DCMAKE_TOOLCHAIN_FILE=bb.toolchain.cmake -DBLACKBERRY=${BB_OS} ..
+cmake ${SIM} -DCMAKE_TOOLCHAIN_FILE=bb.toolchain.cmake -DBLACKBERRY=${BB_OS} .. | grep -v '^-- '
 
 # Compile and create unsigned PPSSPP.bar with debugtoken
 make -j4
diff --git a/b.sh b/b.sh
index 11d9d185df..cf3f3750d8 100755
--- a/b.sh
+++ b/b.sh
@@ -1,8 +1,11 @@
 cp -r android/assets .
 mkdir -p build
 if [[ "$1" == "--headless" ]]; then
-    HEADLESS="-DHEADLESS=ON"
+	HEADLESS="-DHEADLESS=ON"
 else
 	MAKE_OPT="$1"
 fi
-(cd build; cmake $HEADLESS .. && make -j3 $MAKE_OPT; cd ..)
+pushd build
+cmake $HEADLESS .. | grep -v '^-- '
+make -j4 $MAKE_OPT
+popd