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

Fix cmake policy issue globally

Browse source
This commit is contained in:
BtbN 2021-05-13 14:36:08 +02:00
parent f2ab61d2f3
commit 05cffc15cf
2 changed files with 3 additions and 1 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 bug
RUN sed -i 's/.*__SUNPRO_C.*/ FALSE )/' /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

1
scripts.d/50-srt.sh
View file

@ -14,7 +14,6 @@ ffbuild_dockerbuild() {
mkdir build && cd build mkdir build && cd build
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \ 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 .. -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -DENABLE_ENCRYPTION=ON -DENABLE_APPS=OFF ..
make -j$(nproc) make -j$(nproc)
make install make install