diff options
author | Ryan Prichard <rprichard@google.com> | 2023-04-05 13:50:47 -0700 |
---|---|---|
committer | Ryan Prichard <rprichard@google.com> | 2023-04-05 13:54:03 -0700 |
commit | e906380fbfa6823514be59b0523e3e9aa16cee8c (patch) | |
tree | d8b60ae0f944941ba4ca3356d972c386cae2963d | |
parent | 623727be675377694550fc8eb986b2c8257379a4 (diff) | |
download | ninja-cmake-master-dev.tar.gz |
Build Kokoro ninja for Windows using MSVC 2022cmake-master-dev
The MSVC 2017 compiler is no longer available after http://cl/520737351
switched Kokoro from GCP_WINDOWS/dynamic to GCP_WINDOWS_DOCKER/win2019.
The MSVC 2022 Build Tools should be installed, so use that instead.
Replace the " Win64" suffix with the "-A x64" syntax documented at:
https://cmake.org/cmake/help/v3.22/generator/Visual%20Studio%2017%202022.html
Bug: none
Test: kokoro presubmit
Change-Id: Ic8567cceff4d6075b4ceda5382ef466b1d6accd9
-rwxr-xr-x | kokoro/build.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kokoro/build.py b/kokoro/build.py index e57b527..51f111a 100755 --- a/kokoro/build.py +++ b/kokoro/build.py @@ -102,7 +102,7 @@ def main() -> None: ] if host == Host.Windows: - cmake_conf_args += ['-G', 'Visual Studio 15 2017 Win64'] + cmake_conf_args += ['-G', 'Visual Studio 17 2022', '-A', 'x64'] else: # Use the Multi-Config generator for consistency with MSVC, which is also multi-config. # (e.g. "--config Release" replaces CMAKE_BUILD_TYPE, and there is a "Release" subdir.) |