Skip to content

Commit c30b6fd

Browse files
authored
Merge pull request swiftlang#30695 from drexin/wip-bump-cmake
Update cmake version to 3.16.5
2 parents 026c3c9 + 964de28 commit c30b6fd

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ expressed today.
363363

364364
### CMake
365365
[CMake](https://cmake.org) is the core infrastructure used to configure builds of
366-
Swift and its companion projects; at least version 3.4.3 is required.
366+
Swift and its companion projects; at least version 3.16.5 is required.
367367

368368
On macOS, you can download the [CMake Binary Distribution](https://cmake.org/download),
369369
bundled as an application, copy it to `/Applications`, and add the embedded

utils/swift_build_support/swift_build_support/cmake.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ def build_cmake(self, source_root, build_root):
245245

246246
cwd = os.getcwd()
247247
os.chdir(cmake_build_dir)
248-
shell.call_without_sleeping([cmake_bootstrap, '--no-qt-gui'],
249-
echo=True)
248+
shell.call_without_sleeping([cmake_bootstrap, '--no-qt-gui', '--',
249+
'-DCMAKE_USE_OPENSSL=OFF'], echo=True)
250250
shell.call_without_sleeping(['make', '-j%s' % self.args.build_jobs],
251251
echo=True)
252252
os.chdir(cwd)

utils/update_checkout/update-checkout-config.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"swift-xcode-playground-support": "master",
7272
"ninja": "release",
7373
"icu": "release-65-1",
74-
"cmake": "v3.15.1",
74+
"cmake": "v3.16.5",
7575
"indexstore-db": "master",
7676
"sourcekit-lsp": "master",
7777
"swift-format": "master",
@@ -99,7 +99,7 @@
9999
"swift-xcode-playground-support": "master",
100100
"ninja": "release",
101101
"icu": "release-65-1",
102-
"cmake": "v3.15.1",
102+
"cmake": "v3.16.5",
103103
"indexstore-db": "master",
104104
"sourcekit-lsp": "master",
105105
"swift-format": "master",
@@ -297,7 +297,7 @@
297297
"swift-xcode-playground-support": "master",
298298
"ninja": "release",
299299
"icu": "release-65-1",
300-
"cmake": "v3.15.1",
300+
"cmake": "v3.16.5",
301301
"indexstore-db": "master",
302302
"sourcekit-lsp": "master",
303303
"swift-format": "master"

0 commit comments

Comments
 (0)