aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel <gabriel+github@mastergk.de>2020-04-03 19:17:41 +0200
committerGitHub <noreply@github.com>2020-04-03 10:17:41 -0700
commitf4759a6ded9c7090df01c55a87a9fcecf860fe33 (patch)
tree6a03c794c6ecdf810d02c4e72dbcc452edb7ebbd
parenta4028d3ace1484354dc409837946beab6542baae (diff)
downloadvcpkg-f4759a6ded9c7090df01c55a87a9fcecf860fe33.tar.gz
vcpkg-f4759a6ded9c7090df01c55a87a9fcecf860fe33.zip
[opus] Make AVX an optional feature (#10634)
-rw-r--r--ports/opus/CONTROL5
-rw-r--r--ports/opus/portfile.cmake11
2 files changed, 12 insertions, 4 deletions
diff --git a/ports/opus/CONTROL b/ports/opus/CONTROL
index c7b8d246f..f4ed522c3 100644
--- a/ports/opus/CONTROL
+++ b/ports/opus/CONTROL
@@ -1,4 +1,7 @@
Source: opus
-Version: 1.3.1
+Version: 1.3.1-2
Homepage: https://github.com/xiph/opus
Description: Totally open, royalty-free, highly versatile audio codec
+
+Feature: avx
+Description: Builds the library with avx instruction set
diff --git a/ports/opus/portfile.cmake b/ports/opus/portfile.cmake
index bf23718df..a770da51f 100644
--- a/ports/opus/portfile.cmake
+++ b/ports/opus/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH
SOURCE_PATH
@@ -12,7 +10,14 @@ vcpkg_from_github(
HEAD_REF
master)
-vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA)
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+ avx AVX_SUPPORTED
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ OPTIONS ${FEATURE_OPTIONS}
+ PREFER_NINJA)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Opus)
vcpkg_copy_pdbs()