From dfc6dd0a2d4ccb84767987d1f316ce57c19ff62d Mon Sep 17 00:00:00 2001
From: lat9nq <lat9nq@gmail.com>
Date: Mon, 25 Jul 2022 13:02:09 -0400
Subject: cmake,ci: vcpkg for MSVC default, fix lz4 include, catch2, cleanup

vcpkg: Add Catch2 2.13.9

Catch2 >= 3.0 is not compatible with earlier versions, and for now we
must override the desired version in our vcpkg manifest. We can do this
programmatically by using VCPKG_MANIFEST_FEATURES.

CMakeLists: Search for lz4 CONFIG mode first

vcpkg's lz4 CONFIG cmake script works in Release mode but not in Debug
mode, failing to copy the correct DLLs at compile time.

We still need to search for the regular mode for system-installed
versions.

CMakeLists: Clean up boost exports

Remove some Conan-specific workarounds.

CMakeLists: Use vcpkg for MSVC by default

Not enabling it generally since it's much easier to have system
dependencies installed for Linux and MinGW.
---
 vcpkg.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'vcpkg.json')

diff --git a/vcpkg.json b/vcpkg.json
index 8d3c5919a..b247f7386 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,6 +1,7 @@
 {
     "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
     "name": "yuzu",
+    "builtin-baseline": "cef0b3ec767df6e83806899fe9525f6cf8d7bc91",
     "version": "1.0",
     "dependencies": [
         "boost-algorithm",
@@ -25,5 +26,17 @@
         "nlohmann-json",
         "zlib",
         "zstd"
+    ],
+    "features": {
+        "yuzu-tests": {
+            "description": "Compile tests",
+            "dependencies": [ "catch2" ]
+        }
+    },
+    "overrides": [
+        {
+            "name": "catch2",
+            "version": "2.13.9"
+        }
     ]
 }
-- 
cgit v1.2.3