diff options
| author | gllebede <36988895+gllebede@users.noreply.github.com> | 2021-10-13 01:11:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-12 17:11:26 -0700 |
| commit | 050ee6cce0ea11b57cd2ae60857af839dfbe4be6 (patch) | |
| tree | 350e2117e8de15ae541662ce38b4e69f736a90e7 | |
| parent | f978be65342f21f08e066c97d036bc1b3634810c (diff) | |
| download | vcpkg-050ee6cce0ea11b57cd2ae60857af839dfbe4be6.tar.gz vcpkg-050ee6cce0ea11b57cd2ae60857af839dfbe4be6.zip | |
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>
| -rw-r--r-- | ports/v8/V8Config-shared.cmake | 3 | ||||
| -rw-r--r-- | ports/v8/vcpkg.json | 3 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | 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,6 +1,11 @@ { "versions": [ { + "git-tree": "d179f8f99ecce385eab497b2850e605976f4d9d5", + "version": "9.1.269.39", + "port-version": 1 + }, + { "git-tree": "1cd6a72ff77695151205fb2d2e55ed93d2f4193d", "version-string": "9.1.269.39", "port-version": 0 |