From 050ee6cce0ea11b57cd2ae60857af839dfbe4be6 Mon Sep 17 00:00:00 2001
From: gllebede <36988895+gllebede@users.noreply.github.com>
Date: Wed, 13 Oct 2021 01:11:26 +0100
Subject: V8Config-shared compatibility issue fixed for VS generator (#20560)

* V8Config-shared compatibility issue fixed for VS generator

* Version updated

* port version fix

* update version

* adjust first entry

* update version

* Use version rather than version-string.

* Picking V8 snapshot via cmake generator expression

* version fix

Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/v8/V8Config-shared.cmake | 3 +--
 ports/v8/vcpkg.json            | 3 ++-
 versions/baseline.json         | 2 +-
 versions/v-/v8.json            | 5 +++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ports/v8/V8Config-shared.cmake b/ports/v8/V8Config-shared.cmake
index a27074ea3..fadfdb5ac 100644
--- a/ports/v8/V8Config-shared.cmake
+++ b/ports/v8/V8Config-shared.cmake
@@ -15,8 +15,7 @@ endif()
 if(EXISTS ${_IMPORT_PREFIX}/debug/bin/snapshot_blob.bin)
   set(V8_SNAPSHOT_BLOB_DEBUG   ${_IMPORT_PREFIX}/debug/bin/snapshot_blob.bin CACHE FILEPATH "Debug version of V8 snapshot blob location")
 endif()
-string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE)
-set(V8_SNAPSHOT_BLOB ${V8_SNAPSHOT_BLOB_${BUILD_TYPE}})
+set(V8_SNAPSHOT_BLOB "$<IF:$<CONFIG:Debug>,${V8_SNAPSHOT_BLOB_DEBUG},${V8_SNAPSHOT_BLOB_RELEASE}>")
 
 if(EXISTS "${_IMPORT_PREFIX}/lib/v8${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
   set(V8_LIBRARY_RELEASE "${_IMPORT_PREFIX}/lib/v8${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}" CACHE FILEPATH "Release version of the V8 library location")
diff --git a/ports/v8/vcpkg.json b/ports/v8/vcpkg.json
index 2478ba4f9..ba8cfa771 100644
--- a/ports/v8/vcpkg.json
+++ b/ports/v8/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "v8",
-  "version-string": "9.1.269.39",
+  "version": "9.1.269.39",
+  "port-version": 1,
   "description": "Google Chrome's JavaScript engine",
   "homepage": "https://v8.dev",
   "supports": "!(arm | arm64 | uwp | osx)",
diff --git a/versions/baseline.json b/versions/baseline.json
index f0d042d2f..8ed974469 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6906,7 +6906,7 @@
     },
     "v8": {
       "baseline": "9.1.269.39",
-      "port-version": 0
+      "port-version": 1
     },
     "valijson": {
       "baseline": "0.6",
diff --git a/versions/v-/v8.json b/versions/v-/v8.json
index c89d116cf..9a859f286 100644
--- a/versions/v-/v8.json
+++ b/versions/v-/v8.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d179f8f99ecce385eab497b2850e605976f4d9d5",
+      "version": "9.1.269.39",
+      "port-version": 1
+    },
     {
       "git-tree": "1cd6a72ff77695151205fb2d2e55ed93d2f4193d",
       "version-string": "9.1.269.39",
-- 
cgit v1.2.3