From b24be705e939934a49dcb768850fbf6c1e31ff97 Mon Sep 17 00:00:00 2001 From: cbergemann Date: Tue, 10 Nov 2020 18:34:50 +0100 Subject: [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 Co-authored-by: nicole mazzuca --- ports/libflac/CONTROL | 2 +- ports/libflac/portfile.cmake | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3