From 05cffc15cfca4dc48ef4979b20fa304f26e04503 Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 13 May 2021 14:36:08 +0200 Subject: [PATCH] Fix cmake policy issue globally --- images/base-linux64/Dockerfile | 3 +++ scripts.d/50-srt.sh | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/base-linux64/Dockerfile b/images/base-linux64/Dockerfile index 54429a3..0e46ea2 100644 --- a/images/base-linux64/Dockerfile +++ b/images/base-linux64/Dockerfile @@ -12,6 +12,9 @@ RUN \ git config --global user.name "Builder" && \ mkdir /opt/ffbuild +# Work around cmake bug +RUN sed -i 's/.*__SUNPRO_C.*/ FALSE )/' /usr/share/cmake/Modules/CMakeParseImplicitIncludeInfo.cmake + ADD run_stage.sh /usr/bin/run_stage ADD git-mini-clone.sh /usr/bin/git-mini-clone ADD check-wget.sh /usr/bin/check-wget diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index 2b8d36b..055221a 100755 --- a/scripts.d/50-srt.sh +++ b/scripts.d/50-srt.sh @@ -14,7 +14,6 @@ ffbuild_dockerbuild() { mkdir build && cd build cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \ - -DCMAKE_POLICY_DEFAULT_CMP0054=NEW \ -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -DENABLE_ENCRYPTION=ON -DENABLE_APPS=OFF .. make -j$(nproc) make install