From 32621a93698c6972f3015c72ebece37d033b0b03 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 20 Jul 2023 00:03:40 +1000 Subject: [PATCH] 3rdparty: Update wil Gets rid of a -Wdeprecated-volatile error. --- 3rdparty/wil | 2 +- cmake/SearchForStuff.cmake | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/3rdparty/wil b/3rdparty/wil index 3018875eaa..ae986e12b2 160000 --- a/3rdparty/wil +++ b/3rdparty/wil @@ -1 +1 @@ -Subproject commit 3018875eaa4f8e3d86cf2da97fd577bae59f3aec +Subproject commit ae986e12b2fa722ba70e9761ae6897565293cbea diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index 50f22e26b1..0f41dff76a 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -9,11 +9,15 @@ if (WIN32) add_subdirectory(3rdparty/zlib EXCLUDE_FROM_ALL) add_subdirectory(3rdparty/libpng EXCLUDE_FROM_ALL) add_subdirectory(3rdparty/libjpeg EXCLUDE_FROM_ALL) - add_subdirectory(3rdparty/wil EXCLUDE_FROM_ALL) add_subdirectory(3rdparty/xz EXCLUDE_FROM_ALL) add_subdirectory(3rdparty/D3D12MemAlloc EXCLUDE_FROM_ALL) set(FFMPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/3rdparty/ffmpeg/include") find_package(Vtune) + + # Don't try to build tests for WIL, it needs NuGet. + set(WIL_BUILD_TESTS OFF CACHE BOOL "") + set(WIL_BUILD_PACKAGING OFF CACHE BOOL "") + add_subdirectory(3rdparty/wil EXCLUDE_FROM_ALL) else() find_package(PCAP REQUIRED) find_package(LibLZMA REQUIRED)