From 1460cac41ac129d2dde7c337dad717d6dd1ff6c1 Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Mon, 31 Aug 2020 10:09:52 +0200 Subject: [PATCH 1/2] Force vcpkg update in attempt to fix appveyor --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index d9dd9573..f1110ee1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,6 +12,10 @@ install: - cmd: set PATH=C:\Program Files (x86)\Inno Setup 6;%PATH% - cmd: if %platform%==Win32 set VCPKG_TRIPLET=x86-windows-static - cmd: if %platform%==x64 set VCPKG_TRIPLET=x64-windows-static +- cmd: cd c:\tools\vcpkg\ +- cmd: git pull +- cmd: .\bootstrap-vcpkg.bat +- cmd: cd %APPVEYOR_BUILD_FOLDER% - cmd: vcpkg install libsndfile:%VCPKG_TRIPLET% before_build: From 58ca88da176a6a0bd44ed110c1058ad3df2e50e1 Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Mon, 31 Aug 2020 10:53:16 +0200 Subject: [PATCH 2/2] Attempt at fixing the use of vcpkg sndfile --- cmake/SfizzConfig.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/SfizzConfig.cmake b/cmake/SfizzConfig.cmake index fc69cbbd..95b462e6 100644 --- a/cmake/SfizzConfig.cmake +++ b/cmake/SfizzConfig.cmake @@ -51,10 +51,10 @@ endfunction() add_library(sfizz-sndfile INTERFACE) if (SFIZZ_USE_VCPKG OR CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - find_package(LibSndFile REQUIRED) + find_package(SndFile CONFIG REQUIRED) find_path(SNDFILE_INCLUDE_DIR sndfile.hh) target_include_directories(sfizz-sndfile INTERFACE "${SNDFILE_INCLUDE_DIR}") - target_link_libraries(sfizz-sndfile INTERFACE sndfile-static) + target_link_libraries(sfizz-sndfile INTERFACE SndFile::sndfile) else() find_package(PkgConfig REQUIRED) pkg_check_modules(SNDFILE "sndfile" REQUIRED)