[vcpkg-tool] Allow overriding FETCHCONTENT_FULLY_DISCONNECTED (#28489)

* Allow overriding FETCHCONTENT_FULLY_DISCONNECTED * version * prepend instead of append * version * Update version * version * Revert attempting to change scripts/cmake. Co-authored-by: Cheney-Wang <850426846@qq.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
microsoft · Jan 18, 2023 · e1934f4 · e1934f4
1 parent 24c85ba
commit e1934f4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-cmake",
-  "version-date": "2022-11-13",
+  "version-date": "2022-12-22",
   "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-cmake.html",
   "license": "MIT"
 }
diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
@@ -185,7 +185,6 @@ function(vcpkg_cmake_configure)
         "-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}"
         "-D_VCPKG_INSTALLED_DIR=${_VCPKG_INSTALLED_DIR}"
         "-DVCPKG_MANIFEST_INSTALL=OFF"
-        "-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
     )
 
     # Sets configuration variables for macOS builds
@@ -195,6 +194,8 @@ function(vcpkg_cmake_configure)
         endif()
     endforeach()
 
+    vcpkg_list(PREPEND arg_OPTIONS "-DFETCHCONTENT_FULLY_DISCONNECTED=ON")
+
     # Allow overrides / additional configuration variables from triplets
     if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS)
         vcpkg_list(APPEND arg_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS})

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7933,7 +7933,7 @@
       "port-version": 0
     },
     "vcpkg-cmake": {
-      "baseline": "2022-11-13",
+      "baseline": "2022-12-22",
       "port-version": 0
     },
     "vcpkg-cmake-config": {

diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1913f86defd2140d0a6751be2d51952e4090efa4",
+      "version-date": "2022-12-22",
+      "port-version": 0
+    },
     {
       "git-tree": "3adf8df8d492adfc105a09c6e50b913e662178b6",
       "version-date": "2022-11-13",