[submodules] Migrate scope-guard to vcpkg (#4462)

MULTI-2340

Author: sharder996

.gitmodules

@@ -11,9 +11,6 @@
 [submodule "3rd-party/semver"]
 	path = 3rd-party/semver
 	url = https://github.com/CanonicalLtd/semver.git
-[submodule "3rd-party/scope_guard"]
-	path = 3rd-party/scope_guard
-	url = https://github.com/ricab/scope_guard.git
 [submodule "3rd-party/jsoncpp"]
 	path = 3rd-party/jsoncpp
 	url = https://github.com/open-source-parsers/jsoncpp.git

3rd-party/CMakeLists.txt

@@ -108,13 +108,6 @@ add_library(premock INTERFACE)
 target_include_directories(premock INTERFACE
   ${CMAKE_CURRENT_SOURCE_DIR}/premock)
 
-# scope_guard header only library
-add_library(scope_guard INTERFACE)
-target_include_directories(scope_guard INTERFACE
-  ${CMAKE_CURRENT_SOURCE_DIR}/scope_guard)
-target_compile_definitions(scope_guard INTERFACE
-  SG_REQUIRE_NOEXCEPT_IN_CPP17)
-
 # semver library
 add_subdirectory_compat(semver EXCLUDE_FROM_ALL)
 target_include_directories(semver INTERFACE

3rd-party/scope_guard

@@ -21,11 +21,6 @@ Version: 11.0.2 |
 <https://github.com/fmtlib/fmt.git> |
 <https://github.com/fmtlib/fmt/releases>
 
-### scope_guard
-Version: 1.1.0 |
-<https://github.com/ricab/scope_guard.git> |
-<https://github.com/ricab/scope_guard/releases>
-
 ### semver
 Version: 1.1.0 (+[our patches](https://github.com/CanonicalLtd/semver/compare/1.1.0..69e1b1e)) |
 <https://github.com/CanonicalLtd/semver.git> |

3rd-party/submodule_info.md

@@ -176,10 +176,18 @@ find_package(OpenSSL REQUIRED)
 # gRPC config
 find_package(gRPC CONFIG REQUIRED)
 
+
+# SG_REQUIRE_NOEXCEPT_IN_CPP17
 # fmt config
 find_package(fmt CONFIG REQUIRED)
 # targets: fmt::fmt, fmt::fmt-header-only
 
+# scope_guard config
+find_path(SCOPE_GUARD_INCLUDE_DIRS "scope_guard.hpp")
+add_library(scope_guard INTERFACE)
+target_include_directories(scope_guard INTERFACE ${SCOPE_GUARD_INCLUDE_DIRS})
+target_compile_definitions(scope_guard INTERFACE SG_REQUIRE_NOEXCEPT_IN_CPP17)
+
 # Needs to be here before we set further compilation options
 add_subdirectory(3rd-party)
 

CMakeLists.txt

@@ -2,7 +2,8 @@
   "builtin-baseline": "4334d8b4c8916018600212ab4dd4bbdc343065d1",
   "dependencies": [
     "grpc",
-    "fmt"
+    "fmt",
+    "scope-guard"
   ],
   "overrides": [
     {