From a13c1577c2dddfd31c9244c8a4b3153c6e7d166b Mon Sep 17 00:00:00 2001 From: Blue Date: Fri, 27 Mar 2026 11:00:32 -0700 Subject: [PATCH] Update cgmanifest to match CMakeLists.txt (#14550) * Update cgmanifest to match CMakeLists.txt * Update CMakeLists.txt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- CMakeLists.txt | 2 ++ cgmanifest.json | 31 ++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bab62f64..d55d3a9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,8 @@ include(FetchContent) set(FETCHCONTENT_BASE_DIR ${CMAKE_BINARY_DIR}/_deps/${TARGET_PLATFORM}) +# N.B. Changes to any of the FetchContent dependencies below (GSL, nlohmannjson) must be reflected in cgmanifest.json + FetchContent_Declare(GSL URL https://github.com/microsoft/GSL/archive/refs/tags/v4.0.0.tar.gz URL_HASH SHA256=f0e32cb10654fea91ad56bde89170d78cfbf4363ee0b01d8f097de2ba49f6ce9) diff --git a/cgmanifest.json b/cgmanifest.json index 2911f56e..8c8fed58 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -2,15 +2,6 @@ "version": 1, "$schema": "https://json.schemastore.org/component-detection-manifest.json", "registrations": [ - { - "component": { - "type": "git", - "git": { - "repositoryUrl": "https://github.com/microsoft/GSL", - "commitHash": "0f6dbc9e2915ef5c16830f3fa3565738de2a9230" - } - } - }, { "component": { "type": "git", @@ -30,6 +21,28 @@ "hash": "sha1:918692098b11db61aff23684ab04f375e4a68f69" } } + }, + { + "component": { + "type": "other", + "other": { + "name": "GSL", + "version": "4.0.0", + "downloadUrl": "https://github.com/microsoft/GSL/archive/refs/tags/v4.0.0.tar.gz", + "hash": "sha256:f0e32cb10654fea91ad56bde89170d78cfbf4363ee0b01d8f097de2ba49f6ce9" + } + } + }, + { + "component": { + "type": "other", + "other": { + "name": "nlohmann::json", + "version": "3.12.0", + "downloadUrl": "https://github.com/nlohmann/json/releases/download/v3.12.0/json.tar.xz", + "hash": "sha256:42f6e95cad6ec532fd372391373363b62a14af6d771056dbfc86160e6dfff7aa" + } + } } ] } \ No newline at end of file