Skip to content

Commit a57ffa9

Browse files
mayeuthenryiii
mayeut
authored and
henryiii
committed
Update to CMake 3.20.2
1 parent 22dc0c5 commit a57ffa9

8 files changed

+66
-39
lines changed

‎.travis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,25 @@ matrix:
1515
language: generic
1616
env:
1717
- PYTHON_VERSION=3.7.9
18+
- MACOSX_DEPLOYMENT_TARGET=10.10
19+
20+
- os: osx
21+
language: generic
22+
env:
23+
- PYTHON_VERSION=3.7.9
24+
- MACOSX_DEPLOYMENT_TARGET=10.13
25+
26+
- os: osx
27+
language: generic
28+
env:
29+
- PYTHON_VERSION=2.7.18
30+
- MACOSX_DEPLOYMENT_TARGET=10.10
1831

1932
- os: osx
2033
language: generic
2134
env:
2235
- PYTHON_VERSION=2.7.18
36+
- MACOSX_DEPLOYMENT_TARGET=10.13
2337

2438
- arch: arm64-graviton2
2539
virt: vm

‎CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,13 @@ if(CMakePythonDistributions_SUPERBUILD)
6666
set(binary_archive "linux64_binary")
6767
endif()
6868
if(APPLE)
69-
set(binary_archive "macosx_binary")
69+
if("${CMAKE_OSX_DEPLOYMENT_TARGET}" VERSION_LESS "10.10")
70+
message(FATAL_ERROR "Unsupported macOS deployment target: ${CMAKE_OSX_DEPLOYMENT_TARGET} is less than 10.10")
71+
elseif("${CMAKE_OSX_DEPLOYMENT_TARGET}" VERSION_LESS "10.13")
72+
set(binary_archive "macos10_10_binary")
73+
else()
74+
set(binary_archive "macos10_13_binary")
75+
endif()
7076
endif()
7177
if(WIN32)
7278
set(binary_archive "win32_binary")

‎CMakeUrls.cmake

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11

22
#-----------------------------------------------------------------------------
33
# CMake sources
4-
set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.19.1/cmake-3.19.1.tar.gz")
5-
set(unix_source_sha256 "1d266ea3a76ef650cdcf16c782a317cb4a7aa461617ee941e389cb48738a3aba")
4+
set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2.tar.gz")
5+
set(unix_source_sha256 "aecf6ecb975179eb3bb6a4a50cae192d41e92b9372b02300f9e8f1d5f559544e")
66

7-
set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.19.1/cmake-3.19.1.zip")
8-
set(windows_source_sha256 "d3c8fc07b3207c6826b49e46b8194fcdbaab95eaba75dd735e348230efd4400d")
7+
set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2.zip")
8+
set(windows_source_sha256 "70c6fcb80adfc7aa2969c7b1fd020381ea528d06f3c2aab546f4c2407ed5d148")
99

1010
#-----------------------------------------------------------------------------
1111
# CMake binaries
1212

13-
set(linux32_binary_url "NA") # Linux 32-bit binaries not available
14-
set(linux32_binary_sha256 "NA")
13+
set(linux32_binary_url "NA") # Linux 32-bit binaries not available
14+
set(linux32_binary_sha256 "NA")
1515

16-
set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.19.1/cmake-3.19.1-Linux-x86_64.tar.gz")
17-
set(linux64_binary_sha256 "587fb2d882214511f4b260329800de7903eba7827498f06a0dee234ed579bdc3")
16+
set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-linux-x86_64.tar.gz")
17+
set(linux64_binary_sha256 "3f827544f9c82e74ddf5016461fdfcfea4ede58a26f82612f473bf6bfad8bfc2")
1818

19-
set(macosx_binary_url "https://github.com/Kitware/CMake/releases/download/v3.19.1/cmake-3.19.1-Darwin-x86_64.tar.gz")
20-
set(macosx_binary_sha256 "8b1caf1da7bc738a27c820ca8dc2ddb610b7526b4507095de87d79cd5a27028b")
19+
set(macos10_13_binary_url "https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-macos-universal.tar.gz")
20+
set(macos10_13_binary_sha256 "0100663380a3bd977b001183cd487412db7aad9de6859927bde97e1e6e44e645")
2121

22-
set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.19.1/cmake-3.19.1-win32-x86.zip")
23-
set(win32_binary_sha256 "7c01b9cc29a0e5051c11c605b7dd43d187fb25b277e7a3dc4085b9eaf36a0387")
22+
set(macos10_10_binary_url "https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-macos10.10-universal.tar.gz")
23+
set(macos10_10_binary_sha256 "6d9c1c1aecb61d085b1a20503fa94b0c28abae617e20189df61eea4cf876fba0")
2424

25-
set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.19.1/cmake-3.19.1-win64-x64.zip")
26-
set(win64_binary_sha256 "e95d70549f306adb46e0f131dcecdbcbc6412d3a1e073c2c0078812391bf21d3")
25+
set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-windows-i386.zip")
26+
set(win32_binary_sha256 "8ad1f1f9a1a0a0dc82107eb9a4351d91d4e72504b0343368f1569b72a5e48bc1")
27+
28+
set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-windows-x86_64.zip")
29+
set(win64_binary_sha256 "15a49e2ab81c1822d75b1b1a92f7863f58e31f6d6aac1c4103eef2b071be3112")

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The suite of CMake tools were created by Kitware in response to the need
1111
for a powerful, cross-platform build environment for open-source projects
1212
such as ITK and VTK.
1313

14-
The CMake python wheels provide `CMake 3.19.1 <https://cmake.org/cmake/help/v3.19/index.html>`_.
14+
The CMake python wheels provide `CMake 3.20.2 <https://cmake.org/cmake/help/v3.20/index.html>`_.
1515

1616
Latest Release
1717
--------------

‎docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The suite of CMake tools were created by Kitware in response to the need
1515
for a powerful, cross-platform build environment for open-source projects
1616
such as `ITK <https://www.itk.org>`_ and `VTK <http://www.vtk.org>`_.
1717

18-
The CMake python wheels provide `CMake 3.19.1 <https://cmake.org/cmake/help/v3.19/index.html>`_.
18+
The CMake python wheels provide `CMake 3.20.2 <https://cmake.org/cmake/help/v3.20/index.html>`_.
1919

2020
.. toctree::
2121
:maxdepth: 2

‎scikit-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ before_install:
3939
osx:
4040
environment:
4141
PATH: $<HOME>/.pyenv/versions/$<PYTHON_VERSION>/bin:$<PATH>
42-
SETUP_BDIST_WHEEL_ARGS: --plat-name macosx-10.6-x86_64
42+
SETUP_BDIST_WHEEL_ARGS: --plat-name macosx-$<MACOSX_DEPLOYMENT_TARGET>-x86_64
4343
commands:
4444
- python scripts/ssl-check.py
4545
- python ../addons/travis/install_cmake.py 3.12.0

‎scripts/update_cmake_version.py

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ def get_cmake_archive_urls_and_sha256s(version, verbose=False):
4343
sha_256_file = "cmake-%s-SHA-256.txt" % version
4444

4545
expected_files = {
46-
"cmake-%s.tar.gz" % version: "unix_source",
47-
"cmake-%s.zip" % version: "win_source",
48-
"cmake-%s-Linux-x86_64.tar.gz" % version: "linux64_binary",
49-
"cmake-%s-Darwin-x86_64.tar.gz" % version: "macosx_binary",
50-
"cmake-%s-win32-x86.zip" % version: "win32_binary",
51-
"cmake-%s-win64-x64.zip" % version: "win64_binary",
46+
"cmake-%s.tar.gz" % version: "unix_source",
47+
"cmake-%s.zip" % version: "win_source",
48+
"cmake-%s-linux-x86_64.tar.gz" % version: "linux64_binary",
49+
"cmake-%s-macos-universal.tar.gz" % version: "macos10_13_binary",
50+
"cmake-%s-macos10.10-universal.tar.gz" % version: "macos10_10_binary",
51+
"cmake-%s-windows-i386.zip" % version: "win32_binary",
52+
"cmake-%s-windows-x86_64.zip" % version: "win64_binary",
5253
}
5354

5455
# Get SHA256s for each asset
@@ -102,29 +103,32 @@ def generate_cmake_variables(urls_and_sha256s):
102103
cmake_variables = textwrap.dedent("""
103104
#-----------------------------------------------------------------------------
104105
# CMake sources
105-
set(unix_source_url "{unix_source_url}")
106-
set(unix_source_sha256 "{unix_source_sha256}")
106+
set(unix_source_url "{unix_source_url}")
107+
set(unix_source_sha256 "{unix_source_sha256}")
107108
108-
set(windows_source_url "{win_source_url}")
109-
set(windows_source_sha256 "{win_source_sha256}")
109+
set(windows_source_url "{win_source_url}")
110+
set(windows_source_sha256 "{win_source_sha256}")
110111
111112
#-----------------------------------------------------------------------------
112113
# CMake binaries
113114
114-
set(linux32_binary_url "NA") # Linux 32-bit binaries not available
115-
set(linux32_binary_sha256 "NA")
115+
set(linux32_binary_url "NA") # Linux 32-bit binaries not available
116+
set(linux32_binary_sha256 "NA")
116117
117-
set(linux64_binary_url "{linux64_binary_url}")
118-
set(linux64_binary_sha256 "{linux64_binary_sha256}")
118+
set(linux64_binary_url "{linux64_binary_url}")
119+
set(linux64_binary_sha256 "{linux64_binary_sha256}")
119120
120-
set(macosx_binary_url "{macosx_binary_url}")
121-
set(macosx_binary_sha256 "{macosx_binary_sha256}")
121+
set(macos10_13_binary_url "{macos10_13_binary_url}")
122+
set(macos10_13_binary_sha256 "{macos10_13_binary_sha256}")
122123
123-
set(win32_binary_url "{win32_binary_url}")
124-
set(win32_binary_sha256 "{win32_binary_sha256}")
124+
set(macos10_10_binary_url "{macos10_10_binary_url}")
125+
set(macos10_10_binary_sha256 "{macos10_10_binary_sha256}")
125126
126-
set(win64_binary_url "{win64_binary_url}")
127-
set(win64_binary_sha256 "{win64_binary_sha256}")
127+
set(win32_binary_url "{win32_binary_url}")
128+
set(win32_binary_sha256 "{win32_binary_sha256}")
129+
130+
set(win64_binary_url "{win64_binary_url}")
131+
set(win64_binary_sha256 "{win64_binary_sha256}")
128132
""").format(**template_inputs)
129133

130134
return cmake_variables

‎tests/test_distribution.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
def _check_cmake_install(virtualenv, tmpdir):
12-
expected_version = "3.19.1"
12+
expected_version = "3.20.2"
1313

1414
for executable_name in ["cmake", "cpack", "ctest"]:
1515
output = virtualenv.run(

0 commit comments

Comments
 (0)