Skip to content

Commit

Permalink
Toolset update: VS 2022 17.1 Preview 5, CMake 3.22, sparse index (mic…
Browse files Browse the repository at this point in the history
  • Loading branch information
StephanTLavavej authored Feb 12, 2022
1 parent bbd5dba commit 067e8ea
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 17 deletions.
9 changes: 3 additions & 6 deletions .github/ISSUE_TEMPLATE/cxx23-feature.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ and the publication of the papers. When the papers are available,
the https://wg21.link redirector will start working.

Feature-test macro:
`#define MACRO_NAME MACRO_VALUE`

Note: We're still working on finishing C++20. Until we're done
with that (and the compiler implements distinct `/std:c++20` and
`/std:c++latest` options), we won't be able to review PRs for
C++23 features.
```cpp
#define MACRO_NAME MACRO_VALUE
```
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

cmake_minimum_required(VERSION 3.21)
cmake_minimum_required(VERSION 3.22)
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
project(msvc_standard_libraries LANGUAGES CXX)

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem

# How To Build With The Visual Studio IDE

1. Install Visual Studio 2022 17.1 Preview 4 or later.
1. Install Visual Studio 2022 17.1 Preview 5 or later.
* We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
This will ensure that you're using supported versions of CMake and Ninja.
* Otherwise, install [CMake][] 3.21 or later, and [Ninja][] 1.10.2 or later.
* Otherwise, install [CMake][] 3.22 or later, and [Ninja][] 1.10.2 or later.
* We recommend selecting "Python 3 64-bit" in the VS Installer.
* Otherwise, make sure [Python][] 3.9 or later is available to CMake.
2. Open Visual Studio, and choose the "Clone or check out code" option. Enter the URL of this repository,
Expand All @@ -155,10 +155,10 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem

# How To Build With A Native Tools Command Prompt

1. Install Visual Studio 2022 17.1 Preview 4 or later.
1. Install Visual Studio 2022 17.1 Preview 5 or later.
* We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
This will ensure that you're using supported versions of CMake and Ninja.
* Otherwise, install [CMake][] 3.21 or later, and [Ninja][] 1.10.2 or later.
* Otherwise, install [CMake][] 3.22 or later, and [Ninja][] 1.10.2 or later.
* We recommend selecting "Python 3 64-bit" in the VS Installer.
* Otherwise, make sure [Python][] 3.9 or later is available to CMake.
2. Open a command prompt.
Expand Down
5 changes: 1 addition & 4 deletions azure-devops/checkout-sources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,10 @@ steps:
git remote get-url llvm
if errorlevel 1 (
git remote add llvm https://github.com/llvm/llvm-project.git
git config --local extensions.partialClone llvm
)
git fetch --filter=tree:0 --depth=1 llvm $(${{ parameters.llvmSHAVar }})
git sparse-checkout init --cone
git sparse-checkout set libcxx/test libcxx/utils/libcxx llvm/utils/lit
git sparse-checkout set --cone --sparse-index libcxx/test libcxx/utils/libcxx llvm/utils/lit
git reset --quiet --hard FETCH_HEAD
git clean --quiet -x -d -f
displayName: "Checkout LLVM source"
Expand All @@ -63,7 +61,6 @@ steps:
git remote get-url boostorg
if errorlevel 1 (
git remote add boostorg https://github.com/boostorg/math.git
git config --local extensions.partialClone boostorg
)
git fetch --filter=tree:0 --depth=1 boostorg $(${{ parameters.boostMathSHAVar }})
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ variables:
tmpDir: 'D:\Temp'
buildOutputLocation: 'D:\build'

pool: 'StlBuild-2022-01-25-T1318'
pool: 'StlBuild-2022-02-08-T1334'

stages:
- stage: Code_Format
Expand Down
2 changes: 1 addition & 1 deletion tools/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

cmake_minimum_required(VERSION 3.21)
cmake_minimum_required(VERSION 3.22)
project(msvc_standard_libraries_tools LANGUAGES CXX)

set(CMAKE_CXX_STANDARD 20)
Expand Down

0 comments on commit 067e8ea

Please sign in to comment.