Skip to content

Test PR to output config.log for ffmpeg and then exit #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: Omega
Choose a base branch
from
Open

Test PR to output config.log for ffmpeg and then exit #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions depends/common/ffmpeg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,14 @@ if(NOT WIN32)
--enable-gnutls
--enable-libzvbi
${STANDARD_CONF}
${EXTRA_CONF})
${EXTRA_CONF} ||
cmake -E echo "=========================================================" &&
cmake -E echo "FFMPEG configure error" &&
cmake -E echo "The associated config.log is output for troubleshooting." &&
cmake -E echo "--------------------------------- FFMPEG CONFIG LOG START" &&
cat ${CMAKE_BINARY_DIR}/ffmpeg-prefix/src/ffmpeg-build/ffbuild/config.log &&
cmake -E echo "----------------------------------- FFMPEG CONFIG LOG END" &&
exit 1)

if(CORE_SYSTEM_NAME STREQUAL darwin_embedded)
externalproject_add_step(ffmpeg
Expand Down Expand Up @@ -228,7 +235,15 @@ else()
${EXTRA_CONF}
--extra-cflags=[DQ]${EXTRA_CFLAGS}[DQ]
--extra-cxxflags=[DQ]${EXTRA_CXXFLAGS}[DQ]
--extra-ldflags=[DQ]${EXTRA_LDFLAGS}[DQ]
--extra-ldflags=[DQ]${EXTRA_LDFLAGS}[DQ] ||
cmake -E echo "=========================================================" &&
cmake -E echo "FFMPEG configure error" &&
cmake -E echo "The associated config.log is output for troubleshooting." &&
cmake -E echo "--------------------------------- FFMPEG CONFIG LOG START" &&
cd "${CMAKE_BINARY_DIR}\\..\\ffmpeg\\ffbuild" &&
type config.log &&
cmake -E echo "----------------------------------- FFMPEG CONFIG LOG END" &&
exit 1
BUILD_COMMAND ${MINGW_CALL}
make -j$ENV{NUMBER_OF_PROCESSORS}
INSTALL_COMMAND ${MINGW_CALL}
Expand Down