From a434cc74ea515e6612bcb66d8f4ab69bbb8c62bf Mon Sep 17 00:00:00 2001 From: Niall Douglas Date: Tue, 30 Mar 2021 18:17:02 +0100 Subject: [outcome] Replace Outcome single header based port with full fat cmake install port (#15603) * Replace Outcome single header based port with full fat cmake install port. * [outcome] Improve portfile.cmake * update baseline * Refactor @JackBoosY's changes to make the dependency SHA feature chosen. * update baseline * Fix outcome features so they actually work. * update baseline * [outcome] install usage * update baseline * [outcome] Always use vcpkg copies of dependencies * DO NOT MERGE YET, ONLY FOR INSPECTION BY PR REVIEW. 1. Break out these dependencies into standalone ports: - ned14-internal-quickcpplib - status-code 2. Add port for LLFIO. 3. Add dependency smoke tests for Outcome and LLFIO as per instructions. * Fix all remaining issues, including link failure. This changeset is now ready to merge into vcpkg. * Update versions. * Have LLFIO not build static or shared libs according to VCPKG_LIBRARY_LINKAGE. * Fix last commit breaking everything :) * Update versions. * Disable uwp support for LLFIO. * versions * Fix status code on GCC 6 and 7 * Don't download ntkernel-error-category if not on Windows. * Fix status-code on UWP. * Update versions. * Fix MSVC on ARM. * Apply all the feedback from the PR review, more or less. * versions * Update to latest, disable UWP for Outcome. Co-authored-by: JackBoosY Co-authored-by: Robert Schumacher --- .../quicklib-depheaders.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 ports/ned14-internal-quickcpplib/quicklib-depheaders.patch (limited to 'ports/ned14-internal-quickcpplib/quicklib-depheaders.patch') diff --git a/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch b/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch new file mode 100644 index 000000000..6e7ea0a5d --- /dev/null +++ b/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/headers.cmake b/cmake/headers.cmake +index 1aad359..e5053ed 100644 +--- a/cmake/headers.cmake ++++ b/cmake/headers.cmake +@@ -13,8 +13,6 @@ set(quickcpplib_HEADERS + "include/quickcpplib/boost/test/unit_test.hpp" + "include/quickcpplib/byte.hpp" + "include/quickcpplib/byte/include/nonstd/byte.hpp" +- "include/quickcpplib/byte/test/byte-main.t.hpp" +- "include/quickcpplib/byte/test/lest_cpp03.hpp" + "include/quickcpplib/config.hpp" + "include/quickcpplib/console_colours.hpp" + "include/quickcpplib/cpp_feature.h" +@@ -25,15 +23,8 @@ set(quickcpplib_HEADERS + "include/quickcpplib/erasure_cast.hpp" + "include/quickcpplib/execinfo_win64.h" + "include/quickcpplib/function_ptr.hpp" +- "include/quickcpplib/gsl-lite/gsl-lite.natvis" + "include/quickcpplib/gsl-lite/include/gsl-lite/gsl-lite.hpp" +- "include/quickcpplib/gsl-lite/include/gsl.h" +- "include/quickcpplib/gsl-lite/include/gsl.hpp" +- "include/quickcpplib/gsl-lite/include/gsl/gsl-lite-vc6.hpp" +- "include/quickcpplib/gsl-lite/include/gsl/gsl-lite.h" + "include/quickcpplib/gsl-lite/include/gsl/gsl-lite.hpp" +- "include/quickcpplib/gsl-lite/test/gsl-lite.t.hpp" +- "include/quickcpplib/gsl-lite/test/lest_cpp03.hpp" + "include/quickcpplib/import.h" + "include/quickcpplib/in_place_detach_attach.hpp" + "include/quickcpplib/mem_flush_loads_stores.hpp" -- cgit v1.2.3