From 21424f0484d0675d4af73cc66b02a8642aa0e7d8 Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 13 May 2021 15:47:08 +0200 Subject: [PATCH] Test fixed cmake module --- images/base-linux64/Dockerfile | 3 +++ images/base-linux64/toolchain.cmake | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/base-linux64/Dockerfile b/images/base-linux64/Dockerfile index 54429a3..46de04a 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 issue +RUN curl https://gitlab.kitware.com/DerDakon/cmake/-/raw/e591769f711ee5172437472773ed02ab1fe35408/Modules/CMakeParseImplicitIncludeInfo.cmake > /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/images/base-linux64/toolchain.cmake b/images/base-linux64/toolchain.cmake index 544b80d..b4989ce 100644 --- a/images/base-linux64/toolchain.cmake +++ b/images/base-linux64/toolchain.cmake @@ -10,5 +10,3 @@ set(CMAKE_FIND_ROOT_PATH /usr/x86_64-alpine-linux-musl /opt/ffbuild) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - -set(CMAKE_POLICY_DEFAULT_CMP0054 NEW)