From 25a218e9886ebfdf93ed4c9afcea9d94215ead08 Mon Sep 17 00:00:00 2001
From: alemuntoni <muntoni.alessandro@gmail.com>
Date: Thu, 24 Nov 2022 12:50:10 +0100
Subject: [PATCH] better ninja build output

---
 scripts/Linux/1_build.sh   | 9 +++------
 scripts/Windows/1_build.sh | 3 ++-
 scripts/macOS/1_build.sh   | 6 +-----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/scripts/Linux/1_build.sh b/scripts/Linux/1_build.sh
index 22744c118..b63f45d92 100644
--- a/scripts/Linux/1_build.sh
+++ b/scripts/Linux/1_build.sh
@@ -16,7 +16,6 @@ SCRIPTS_PATH="$(dirname "$(realpath "$0")")"
 SOURCE_PATH=$SCRIPTS_PATH/../../src
 BUILD_PATH=$SOURCE_PATH/../build
 INSTALL_PATH=$SOURCE_PATH/../install/usr/
-CORES="-j4"
 DOUBLE_PRECISION_OPTION=""
 NIGHTLY_OPTION=""
 QT_DIR=""
@@ -34,10 +33,6 @@ case $i in
         INSTALL_PATH="${i#*=}"/usr/
         shift # past argument=value
         ;;
-    -j*)
-        CORES=$i
-        shift # past argument=value
-        ;;
     -d|--double_precision)
         DOUBLE_PRECISION_OPTION="-DMESHLAB_BUILD_WITH_DOUBLE_SCALAR=ON"
         shift # past argument=value
@@ -75,11 +70,13 @@ fi
 BUILD_PATH=$(realpath $BUILD_PATH)
 INSTALL_PATH=$(realpath $INSTALL_PATH)
 
-cd $BUILD_PATH
 if [ ! -z "$QT_DIR" ]
 then
     export Qt5_DIR=$QT_DIR
 fi
+
+cd $BUILD_PATH
+export NINJA_STATUS="[%p (%f/%t) ] "
 cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH $CCACHE $DOUBLE_PRECISION_OPTION $NIGHTLY_OPTION $SOURCE_PATH
 ninja
 ninja install
diff --git a/scripts/Windows/1_build.sh b/scripts/Windows/1_build.sh
index b541d27b4..6a793f8e0 100644
--- a/scripts/Windows/1_build.sh
+++ b/scripts/Windows/1_build.sh
@@ -70,12 +70,13 @@ fi
 BUILD_PATH=$(realpath $BUILD_PATH)
 INSTALL_PATH=$(realpath $INSTALL_PATH)
 
-cd $BUILD_PATH
 if [ ! -z "$QT_DIR" ]
 then
     export Qt5_DIR=$QT_DIR
 fi
 
+cd $BUILD_PATH
+export NINJA_STATUS="[%p (%f/%t) ] "
 cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH $CCACHE $DOUBLE_PRECISION_OPTION $NIGHTLY_OPTION $SOURCE_PATH
 ninja
 ninja install
diff --git a/scripts/macOS/1_build.sh b/scripts/macOS/1_build.sh
index b6981a2cf..990eb0854 100644
--- a/scripts/macOS/1_build.sh
+++ b/scripts/macOS/1_build.sh
@@ -17,7 +17,6 @@ SOURCE_PATH=$SCRIPTS_PATH/../../src
 RESOURCES_PATH=$SCRIPTS_PATH/../../resources
 BUILD_PATH=$SOURCE_PATH/../build
 INSTALL_PATH=$SOURCE_PATH/../install
-CORES="-j4"
 DOUBLE_PRECISION_OPTION=""
 NIGHTLY_OPTION=""
 QT_DIR=""
@@ -35,10 +34,6 @@ case $i in
         INSTALL_PATH="${i#*=}"
         shift # past argument=value
         ;;
-    -j*)
-        CORES=$i
-        shift # past argument=value
-        ;;
     -d|--double_precision)
         DOUBLE_PRECISION_OPTION="-DMESHLAB_BUILD_WITH_DOUBLE_SCALAR=ON"
         shift # past argument=value
@@ -74,6 +69,7 @@ then
 fi
 
 cd $BUILD_PATH
+export NINJA_STATUS="[%p (%f/%t) ] "
 cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH $CCACHE $DOUBLE_PRECISION_OPTION $NIGHTLY_OPTION $SOURCE_PATH
 ninja
 ninja install