Skip to content

Commit f432bd9

Browse files
authored
Merge pull request #36094 from zoecarver/bump-cmake-req
Bump CMake version to 3.19.6.
2 parents 03ff464 + a13c57c commit f432bd9

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.12.4)
1+
cmake_minimum_required(VERSION 3.19.6)
22

33
# TODO: Fix RPATH usage to be CMP0068 compliant
44
# Disable Policy CMP0068 for CMake 3.9
@@ -183,7 +183,7 @@ endif()
183183
set(SWIFT_USE_LINKER ${SWIFT_USE_LINKER_default} CACHE STRING
184184
"Build Swift with a non-default linker")
185185

186-
option(SWIFT_DISABLE_DEAD_STRIPPING
186+
option(SWIFT_DISABLE_DEAD_STRIPPING
187187
"Turn off Darwin-specific dead stripping for Swift host tools." FALSE)
188188

189189
set(SWIFT_TOOLS_ENABLE_LTO OFF CACHE STRING "Build Swift tools with LTO. One

benchmark/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- mode: cmake -*-
22

3-
cmake_minimum_required(VERSION 2.8.12)
3+
cmake_minimum_required(VERSION 3.19.6)
44

55
# Add path for custom CMake modules.
66
list(APPEND CMAKE_MODULE_PATH

benchmark/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ library should be distributed alongside them.
4343
### CMake Standalone (no build-script)
4444

4545
To build the Swift benchmarks using only an Xcode installation: install an
46-
Xcode version with Swift support, install cmake 2.8.12, and ensure Xcode is
46+
Xcode version with Swift support, install cmake 3.19.6 or higher, and ensure Xcode is
4747
selected with xcode-select.
4848

4949
The following build options are available:

docs/HowToGuides/GettingStarted.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ Double-check that running `pwd` prints a path ending with `swift`.
158158
* [CentOS 7](https://github.com/apple/swift-docker/blob/main/swift-ci/master/centos/7/Dockerfile)
159159
* [CentOS 8](https://github.com/apple/swift-docker/blob/main/swift-ci/master/centos/8/Dockerfile)
160160
* [Amazon Linux 2](https://github.com/apple/swift-docker/blob/main/swift-ci/master/amazon-linux/2/Dockerfile)
161-
161+
162162
2. To install sccache (optional):
163163
```
164164
sudo snap install sccache --candidate --classic
@@ -170,7 +170,7 @@ Double-check that running `pwd` prints a path ending with `swift`.
170170
171171
### Spot check dependencies
172172
173-
* Run `cmake --version`: This should be 3.18.1 or higher for macOS.
173+
* Run `cmake --version`: This should be 3.19.6 or higher.
174174
* Run `python3 --version`: Check that this succeeds.
175175
* Run `ninja --version`: Check that this succeeds.
176176
* Run `sccache --version`: Check that this succeeds.

0 commit comments

Comments
 (0)