Skip to content

Commit 9f0eccb

Browse files
authored
Merge pull request #118 from AWSjswinney/master
Update to CMake 3.18.4
2 parents 4c4311d + fbbbefa commit 9f0eccb

File tree

6 files changed

+16
-32
lines changed

6 files changed

+16
-32
lines changed

.circleci/config.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ references:
3636
- image: dockcross/manylinux1-x86
3737
<<: *ci_steps
3838

39-
aarch64_build_job: &aarch64_build_job
40-
docker:
41-
- image: dockcross/manylinux2014-aarch64
42-
<<: *ci_steps
43-
4439
no_filters: &no_filters
4540
filters:
4641
tags:
@@ -60,10 +55,6 @@ jobs:
6055
manylinux-x86_cp37-cp37m:
6156
<<: *x86_build_job
6257

63-
# aarch64
64-
manylinux-aarch64_cp37-cp37m:
65-
<<: *aarch64_build_job
66-
6758
deploy-master:
6859
docker:
6960
- image: circleci/python:3.7.0-stretch
@@ -105,9 +96,6 @@ workflows:
10596
<<: *no_filters
10697
- manylinux-x86_cp37-cp37m:
10798
<<: *no_filters
108-
# aarch64
109-
- manylinux-aarch64_cp37-cp37m:
110-
<<: *no_filters
11199

112100
- deploy-master:
113101
requires:
@@ -117,8 +105,6 @@ workflows:
117105
# x86
118106
- manylinux-x86_cp27-cp27mu
119107
- manylinux-x86_cp37-cp37m
120-
# aarch64
121-
- manylinux-aarch64_cp37-cp37m
122108
filters:
123109
branches:
124110
only: master
@@ -130,8 +116,6 @@ workflows:
130116
# x86
131117
- manylinux-x86_cp27-cp27mu
132118
- manylinux-x86_cp37-cp37m
133-
# aarch64
134-
- manylinux-aarch64_cp37-cp37m
135119
filters:
136120
tags:
137121
only: /^[0-9]+(\.[0-9]+)*(\.post[0-9]+)?$/

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ matrix:
1919
- PYTHON_VERSION=2.7.15
2020

2121
- os: linux
22-
arch: arm64
22+
arch: arm64-graviton2
2323
virt: vm
2424
group: edge
2525
dist: focal

CMakeUrls.cmake

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

22
#-----------------------------------------------------------------------------
33
# CMake sources
4-
set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2.tar.gz")
5-
set(unix_source_sha256 "5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e")
4+
set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4.tar.gz")
5+
set(unix_source_sha256 "597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77")
66

7-
set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2.zip")
8-
set(windows_source_sha256 "ccffbd2e983a604ac1b95433e751da8c11e552bbc1e138a953f23fd3e6c594d1")
7+
set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4.zip")
8+
set(windows_source_sha256 "16df4f582cce7785d9c9f760d0cd8d1480d158a8b32e80f4570732c5eb205a4c")
99

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

1313
set(linux32_binary_url "NA") # Linux 32-bit binaries not available
1414
set(linux32_binary_sha256 "NA")
1515

16-
set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2-Linux-x86_64.tar.gz")
17-
set(linux64_binary_sha256 "7b73ef901eb9fe615977a4f2254521cf9ee9da7efcd20c621a61ead51a870948")
16+
set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4-Linux-x86_64.tar.gz")
17+
set(linux64_binary_sha256 "149e0cee002e59e0bb84543cf3cb099f108c08390392605e944daeb6594cbc29")
1818

19-
set(macosx_binary_url "https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2-Darwin-x86_64.tar.gz")
20-
set(macosx_binary_sha256 "7cf5525169b723e6b7544a44c391c36d855df3b51355d60e3aed53d640b8569c")
19+
set(macosx_binary_url "https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4-Darwin-x86_64.tar.gz")
20+
set(macosx_binary_sha256 "9d27049660474cf134ab46fa0e0db771b263313fcb8ba82ee8b2d1a1a62f8f20")
2121

22-
set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2-win32-x86.zip")
23-
set(win32_binary_sha256 "209c7e3cf0eb7e83801858397e48322479eaacbf296b8c02d4d7d4614b1ce5e3")
22+
set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4-win32-x86.zip")
23+
set(win32_binary_sha256 "4c519051853686927f87df99669ada3ff15a3086535a7131892febd7c6e2f122")
2424

25-
set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2-win64-x64.zip")
26-
set(win64_binary_sha256 "5f4ec834fbd9b62fbf73bc48ed459fa2ea6a86c403106c90fedc2ac76d51612d")
25+
set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4-win64-x64.zip")
26+
set(win64_binary_sha256 "a932bc0c8ee79f1003204466c525b38a840424d4ae29f9e5fb88959116f2407d")

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.18.2 <https://cmake.org/cmake/help/v3.18/index.html>`_.
14+
The CMake python wheels provide `CMake 3.18.4 <https://cmake.org/cmake/help/v3.18/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.18.2 <https://cmake.org/cmake/help/v3.18/index.html>`_.
18+
The CMake python wheels provide `CMake 3.18.4 <https://cmake.org/cmake/help/v3.18/index.html>`_.
1919

2020
.. toctree::
2121
:maxdepth: 2

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.18.2"
12+
expected_version = "3.18.4"
1313

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

0 commit comments

Comments
 (0)