Skip to content

[libvpx] Change default target on Unix #11500

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

Merged
strega-nil merged 6 commits into from
May 26, 2020
Merged

[libvpx] Change default target on Unix #11500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
40822b3
[libvpx] Change default target on Unix
kafeg May 21, 2020
5672da3
Update CONTROL
kafeg May 22, 2020
e7472eb
[libvpx] Support to build x86/x64 on Unix
kafeg May 23, 2020
b3457fc
[libvpx] Update by review comments
kafeg May 24, 2020
7be883d
Update portfile.cmake
kafeg May 25, 2020
45d8936
[libvpx] By default build with 'generic-gnu'
kafeg May 26, 2020
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
2 changes: 1 addition & 1 deletion ports/libvpx/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: libvpx
Version: 1.8.1-3
Version: 1.8.1-4
Homepage: https://github.com/webmproject/libvpx
Description: The reference software implementation for the video coding formats VP8 and VP9.
Supports: !(uwp|arm|arm64)
20 changes: 19 additions & 1 deletion ports/libvpx/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,24 @@ else()
else()
set(OPTIONS "${OPTIONS} --enable-static --disable-shared")
endif()

if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
set(LIBVPX_TARGET_ARCH "x86")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
set(LIBVPX_TARGET_ARCH "x86_64")
else()
message(FATAL_ERROR "libvpx does not support architecture ${VCPKG_TARGET_ARCHITECTURE}")
endif()

if(VCPKG_TARGET_IS_LINUX)
set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-linux-gcc")
elseif(VCPKG_TARGET_IS_OSX)
set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-darwin17-gcc") # enable latest CPU instructions for best performance and less CPU usage on MacOS
else()
set(LIBVPX_TARGET "generic-gnu") # use default target
endif()

message(STATUS "Building Options: ${OPTIONS}")
message(STATUS "Build info. Target: ${LIBVPX_TARGET}; Options: ${OPTIONS}")

if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
message(STATUS "Configuring libvpx for Release")
Expand All @@ -138,6 +154,7 @@ else()
COMMAND
${BASH} --noprofile --norc
"${SOURCE_PATH}/configure"
--target=${LIBVPX_TARGET}
${OPTIONS}
${OPTIONS_RELEASE}
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
Expand Down Expand Up @@ -169,6 +186,7 @@ else()
COMMAND
${BASH} --noprofile --norc
"${SOURCE_PATH}/configure"
--target=${LIBVPX_TARGET}
${OPTIONS}
${OPTIONS_DEBUG}
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
Expand Down