From bd45fdf1e16e7d4ff49e1472ee30f269867f531e Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Tue, 17 Dec 2019 23:52:05 +0100
Subject: Add version and adjust some cmake

---
 configure | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index da82fd64..c60488ab 100755
--- a/configure
+++ b/configure
@@ -191,9 +191,16 @@ if ! [ -x "$ninja_bin" ]; then
     ninja_bin="$(which ninja 2>/dev/null)"
 fi
 if [ -x "$ninja_bin" ]; then
-    ninja_version=$($ninja_bin --version 2>/dev/null)
+    ninja_version=`$ninja_bin --version 2>/dev/null`
     if [ $? -eq 0 ]; then
-        echo "-- Found Ninja: $ninja_bin (found version \"$ninja_version\")"
+        if [ -d build ]; then
+            last_ninja_version=`cat build/.ninja_version 2>/dev/null`
+        else
+            last_ninja_version=0
+        fi
+        if [ "$ninja_version" != "$last_ninja_version" ]; then
+            echo "-- Found Ninja: $ninja_bin (found version \"$ninja_version\")"
+        fi
         cmake_type="Ninja"
         exec_bin="$ninja_bin"
         exec_command="$exec_bin"
@@ -219,14 +226,12 @@ if ! [ -x "$exec_bin" ]; then
 fi
 
 
-if [ -f ./build ]
-then
+if [ -f ./build ]; then
     echo "-!- ./build file exists. ./configure can't continue"
     exit 2
 fi
 
-if [ -d build ]
-then
+if [ -d build ]; then
     last_type=`cat build/.cmake_type`
     if [ "$cmake_type" != "$last_type" ]
     then
@@ -241,6 +246,7 @@ mkdir -p build
 cd build
 
 echo "$cmake_type" > .cmake_type
+echo "$ninja_version" > .ninja_version
 cmake -G "$cmake_type" \
     -DCMAKE_INSTALL_PREFIX="$PREFIX" \
     -DENABLED_PLUGINS="$ENABLED_PLUGINS" \
@@ -256,10 +262,10 @@ cmake -G "$cmake_type" \
     -DBIN_INSTALL_DIR="$BINDIR" \
     -DINCLUDE_INSTALL_DIR="$INCLUDEDIR" \
     -DLIB_INSTALL_DIR="$LIBDIR" \
+    -Wno-dev \
     .. || exit 9
 
-if [ "$cmake_type" = "Ninja" ]
-then
+if [ "$cmake_type" = "Ninja" ]; then
 cat << EOF > Makefile
 default:
 	@sh -c "$exec_command"
-- 
cgit v1.2.3-54-g00ecf