diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-10-14 12:28:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-14 12:28:24 -0700 |
| commit | 2c5e2fae891b39e64d5bec9cb9ccdaa991e49692 (patch) | |
| tree | 3e8ef92877c54b60c9df6948e2bbac9aaa139984 | |
| parent | 630b8fe66f58f8550658bdb417c9591cf8fa3b09 (diff) | |
| parent | 20d49dcf624d0418e3b9743c86823b097936ae29 (diff) | |
| download | vcpkg-2c5e2fae891b39e64d5bec9cb9ccdaa991e49692.tar.gz vcpkg-2c5e2fae891b39e64d5bec9cb9ccdaa991e49692.zip | |
Merge pull request #8596 from koprok/ffmpeg-vcpkg-c-flags
[ffmpeg] Pass Vcpkg compiler and linker flags to build script
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 578a8a91a..e8f12f97e 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 4.2 +Version: 4.2-1 Build-Depends: zlib Homepage: https://ffmpeg.org Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 394eb9cbc..71bea6e95 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -182,6 +182,8 @@ message(STATUS "Building Options: ${OPTIONS}") if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) message(STATUS "Building Relase Options: ${OPTIONS_RELEASE}") set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/lib${SEP}${ENV_LIB_PATH}") + set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}") + set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}") message(STATUS "Building ${_csc_PROJECT_PATH} for Release") file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) vcpkg_execute_required_process( @@ -199,6 +201,8 @@ endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) message(STATUS "Building Debug Options: ${OPTIONS_DEBUG}") set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/debug/lib${SEP}${ENV_LIB_PATH}") + set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}") + set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}") message(STATUS "Building ${_csc_PROJECT_PATH} for Debug") file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) vcpkg_execute_required_process( |