From bc30a591ba7252e0c16d9c1b3c75a7073735bcae Mon Sep 17 00:00:00 2001 From: James Rowe Date: Fri, 8 May 2020 15:09:29 -0600 Subject: Replace externals with Conan (#3735) * Remove git submodules that will be loaded through conan * Move custom Find modules to their own folder * Use conan for downloading missing external dependencies * CI: Change the yuzu source folder user to the user that the containers run on * Attempt to remove dirty mingw build hack * Install conan on the msvc build * Only set release build type when using not using multi config generator * Re-add qt bundled to workaround an issue with conan qt not downloading prebuilt binaries * Add workaround for submodules that use legacy CMAKE variables * Re-add USE_BUNDLED_QT on the msvc build bot --- externals/json/README.md | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 externals/json/README.md (limited to 'externals/json/README.md') diff --git a/externals/json/README.md b/externals/json/README.md deleted file mode 100644 index 2db68ffde..000000000 --- a/externals/json/README.md +++ /dev/null @@ -1,9 +0,0 @@ -JSON for Modern C++ -=================== - -v3.1.2 - -This is a mirror providing the single required header file. - -The original repository can be found at: -https://github.com/nlohmann/json/commit/d2dd27dc3b8472dbaa7d66f83619b3ebcd9185fe -- cgit v1.2.3