dw/FFmpeg-Builds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Test fixed cmake module

Browse source
This commit is contained in:
BtbN 2021-05-13 15:47:08 +02:00
parent 79716dac4b
commit 21424f0484
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
images/base-linux64/Dockerfile
View file

@ -12,6 +12,9 @@ RUN \
git config --global user.name "Builder" && \ git config --global user.name "Builder" && \
mkdir /opt/ffbuild 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 run_stage.sh /usr/bin/run_stage
ADD git-mini-clone.sh /usr/bin/git-mini-clone ADD git-mini-clone.sh /usr/bin/git-mini-clone
ADD check-wget.sh /usr/bin/check-wget ADD check-wget.sh /usr/bin/check-wget

2
images/base-linux64/toolchain.cmake
View file

@ -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_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(CMAKE_POLICY_DEFAULT_CMP0054 NEW)