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 --- ports/v8/V8Config-shared.cmake | 3 +-- ports/v8/vcpkg.json | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ports') 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 "$,${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)", -- cgit v1.2.3