CMake build dependencies FFMPEG and VPX fix
ClosedPublic
Actions

Authored by Arto Kitula (akitula) on Aug 14 2017, 11:43 PM.

Details

Reviewers

Commits

rBScaefe4943b4d: [deps_build/macOS] Fix FFMPEG & VPX configure command
rBcaefe4943b4d: [deps_build/macOS] Fix FFMPEG & VPX configure command

Summary

FFMPEG and VPX don't understand configure --build parameter
Also preventing generic-gnu to be used as vpx target.

Here is the fix.

FFMPEG flags need to be investigated to point darwin13 as target platform, I didn't find (yet) other than plain darwin as target.

Diff Detail

Repository: rB Blender

Event Timeline

Arto Kitula (akitula) created this revision.Aug 14 2017, 11:43 PM

This may break Windows, where ${CONFIGURE_COMMAND} is defined as sh ./configure. Keeping CONFIGURE_COMMAND may be fine if the --build parameter is just ignored? If not we can define VPX/FFMPEG_CONFIGURE_COMMAND depending on the platform.

We're also setting the deployment target with MACOSX_DEPLOYMENT_TARGET and CFLAGS environment variables, so even with the generic target it may already be building with all the required flags.

This revision now requires changes to proceed.Aug 15 2017, 12:00 AM

Updated to have FFMPEGVPX_CONFIGURE_COMMAND.

--build is not ignored configure flag, so we need to strip that out to even run through configure.

Brecht Van Lommel (brecht) accepted this revision.Aug 15 2017, 10:47 AM

Brecht Van Lommel (brecht) added inline comments.

build_files/build_environment/cmake/options.cmake
111 ↗	(On Diff #9129)	Can you rename this `CONFIGURE_COMMAND_NO_ARCH` or something like it? Before I was suggesting to define a `VPX_CONFIGURE_COMMAND` and `FFMPEG_CONFIGURE_COMMAND` in vpx.cmake and ffmpeg.cmake files. This is fine too, but needs a generic name then I think.