From 3a93d91c20d8a66c944bfc9dc313425ff3daba7b Mon Sep 17 00:00:00 2001 From: FriwiDev Date: Thu, 16 Dec 2021 19:14:19 +0100 Subject: [PATCH] Debug workdir on linux --- compile_linux.sh | 3 +++ scripts/patch_cmake.py | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/compile_linux.sh b/compile_linux.sh index 8be2595..62e483c 100755 --- a/compile_linux.sh +++ b/compile_linux.sh @@ -17,6 +17,9 @@ cd "$( dirname "$0" )" rm -rf out mkdir out +pwd +ls -a + #Execute buildx with linux dockerfile and output to current directory if [ $# -eq 2 ] then diff --git a/scripts/patch_cmake.py b/scripts/patch_cmake.py index 5e5a6ba..b5de70d 100644 --- a/scripts/patch_cmake.py +++ b/scripts/patch_cmake.py @@ -22,14 +22,15 @@ for x in f: elif x.startswith("# Add this project's cmake"): inpatch = False if inpatch == False: - result += x + #Patch minimum cmake version to not break our builds on linux + if x.startsWith("cmake_minimum_required"): + result += "cmake_minimum_required(VERSION 3.18)\n" + else + result += x f.close() p.close() -#Replace cmake version, as 3.19 is not really needed -result.replace("3.19", "3.18") - f = open(input, "w") f.write(result) f.close()