Compiler warnings (Cmake related) removed

ghorwin · Sep 29, 2024 · f3a2691 · f3a2691
1 parent 47342ce
commit f3a2691
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists.txt file for MasterSim library and applications
 # Author: Andreas Nicolai (andreas.nicolai -at- tu-dresden.de)
 
+# Require a fairly recent cmake version
+cmake_minimum_required( VERSION 2.8...3.10 )
+
 # The project name
 project( MasterSimBundle )
 
-# Require a fairly recent cmake version
-cmake_minimum_required( VERSION 2.8.12 )
-
 # enable @rpath on MacOS
 cmake_policy(SET CMP0042 NEW)
 

diff --git a/build/cmake/build.sh b/build/cmake/build.sh
@@ -153,9 +153,10 @@ if [ -e $BUILDDIR/MasterSimulator/MasterSimulator ]; then
 fi &&
 if [ -e $BUILDDIR/MasterSimulatorUI/MasterSimulatorUI ]; then
   echo "*** Copying MasterSimulatorUI to bin/release ***" &&
-  cp $BUILDDIR/MasterSimulatorUI/MasterSimulatorUI ../../bin/release/MasterSimulatorUI && 
+  cp $BUILDDIR/MasterSimulatorUI/MasterSimulatorUI ../../bin/release/MasterSimulatorUI 
+  # next call may fail on GitHub actions, so we do not require this to succeed
   ../../bin/release/MasterSimulatorUI --man-page > ../../MasterSimulatorUI/doc/MasterSimulatorUI.1
-fi &&
+fi 
 if [ -e $BUILDDIR/MasterSimulatorUI/MasterSimulatorUI.app ]; then
   if [ -e ../../bin/release/MasterSimulatorUI.app ]; then
     rm -rf ../../bin/release/MasterSimulatorUI.app