Merge pull request #401 from jpcima/vcpkg-updates

Vcpkg updates
This commit is contained in:
JP Cimalando 2020-09-02 01:43:18 +02:00 committed by GitHub
commit e2a0c521c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View file

@ -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:

View file

@ -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)