diff options
| author | cbergemann <cbe+github@mailbox.org> | 2020-11-10 18:34:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 09:34:50 -0800 |
| commit | b24be705e939934a49dcb768850fbf6c1e31ff97 (patch) | |
| tree | d36ceb19fe4d3cffb8b71fd936060b84980ebc74 | |
| parent | 74844c75467ddd9af502df0b927cd5e7115d04aa (diff) | |
| download | vcpkg-b24be705e939934a49dcb768850fbf6c1e31ff97.tar.gz vcpkg-b24be705e939934a49dcb768850fbf6c1e31ff97.zip | |
[libflac] require NASM for libflac[asm] (#14465)
* require NASM for libflac[asm]
* Increment port version number
* Update ports/libflac/portfile.cmake
Co-authored-by: BergemannC <CBergemann@nordex-online.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
| -rw-r--r-- | ports/libflac/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libflac/portfile.cmake | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ports/libflac/CONTROL b/ports/libflac/CONTROL index 529ea161a..4af8f1576 100644 --- a/ports/libflac/CONTROL +++ b/ports/libflac/CONTROL @@ -1,6 +1,6 @@ Source: libflac Version: 1.3.3 -Port-Version: 4 +Port-Version: 5 Homepage: https://xiph.org/flac/ Description: Library for manipulating FLAC files Build-Depends: libogg diff --git a/ports/libflac/portfile.cmake b/ports/libflac/portfile.cmake index dfaab66b3..4f1ca9a3a 100644 --- a/ports/libflac/portfile.cmake +++ b/ports/libflac/portfile.cmake @@ -22,6 +22,10 @@ if("asm" IN_LIST FEATURES) if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x86) message(FATAL_ERROR "Feature asm only supports x86 architecture.") endif() + + VCPKG_FIND_ACQUIRE_PROGRAM(NASM) + GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY) + vcpkg_add_to_path("${NASM_PATH}") endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS |