Skip to content

Commit 5b25b79

Browse files
author
Johan Vos
committed
8308308: Update to Visual Studio 2022 version 17.5.0 on Windows
8303748: WebKit build fails with Visual Studio 2022 17.5.0 Backport-of: 8fc1a25
1 parent 45b7fc3 commit 5b25b79

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jfx.gradle.version.min=6.3
8989

9090
# Toolchains
9191
jfx.build.linux.gcc.version=gcc12.2.0-OL6.4+1.0
92-
jfx.build.windows.msvc.version=VS2022-17.1.0+1.0
92+
jfx.build.windows.msvc.version=VS2022-17.5.0+1.0
9393
jfx.build.macosx.xcode.version=Xcode14.3+1.0
9494

9595
# Build tools

gradle/verification-metadata.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@
9696
<sha256 value="90011895771bd98c16ea38d180935784fd99f1273ff7537125a4f97949e7e73c" origin="Generated by Gradle"/>
9797
</artifact>
9898
</component>
99-
<component group="javafx" name="devkit-windows_x64-VS2022" version="17.1.0+1.0.tar">
100-
<artifact name="devkit-windows_x64-VS2022-17.1.0+1.0.tar.gz">
101-
<sha256 value="5768a83b6277c18e71cf3857df135b36be1a07ab88e0bd828c68181d9eb3be01" origin="Generated by Gradle"/>
99+
<component group="javafx" name="devkit-windows_x64-VS2022" version="17.5.0+1.0.tar">
100+
<artifact name="devkit-windows_x64-VS2022-17.5.0+1.0.tar.gz">
101+
<sha256 value="97b7bff02214aeeda40980a59c71c49396a0a45a04e3ef2a500fc228b262ab35" origin="Generated by Gradle"/>
102102
</artifact>
103103
</component>
104104
<component group="javafx" name="jdk-12_doc" version="all">

modules/javafx.web/src/main/native/Source/cmake/OptionsCommon.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
if(CMAKE_SYSTEM_NAME MATCHES "Windows")
2+
set(CMAKE_CXX_STANDARD 20)
3+
else()
14
set(CMAKE_CXX_STANDARD 17)
5+
endif()
26
set(CMAKE_CXX_STANDARD_REQUIRED ON)
37
set(CMAKE_CXX_EXTENSIONS OFF)
48

0 commit comments

Comments
 (0)