Skip to content

Commit b5488d2

Browse files
authored
Update C++ version and use newer Windows SDK (#683)
1 parent a0d8507 commit b5488d2

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
# Higher CMake version needed for improvments in UseSwig.cmake and string join
1818
cmake_minimum_required (VERSION 3.13.4)
19-
set (CMAKE_CXX_STANDARD 11)
19+
set (CMAKE_CXX_STANDARD 14)
20+
set (CMAKE_CXX_STANDARD_REQUIRED YES) # Don't fall back to an earlier version.
2021

2122
# Turn on virtual folders for visual studio
2223
set_property(GLOBAL PROPERTY USE_FOLDERS ON)

scripts/build_scripts/build_zips.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,9 @@ def get_windows_args():
433433
result_args.append('-G Visual Studio 16 2019')
434434
result_args.append('-A x64') # TODO flexibily for x32
435435
result_args.append("-DFIREBASE_PYTHON_HOST_EXECUTABLE:FILEPATH=%s" % sys.executable)
436+
# Use a newer version of the Windows SDK, as the default one has build issues with grpc
437+
if FLAGS.gha:
438+
result_args.append('-DCMAKE_SYSTEM_VERSION=10.0.20348.0')
436439
return result_args
437440

438441
def get_macos_args():

0 commit comments

Comments
 (0)