Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to CMake 3.18.4 #118

Merged
merged 2 commits into from
Nov 11, 2020
Merged

Update to CMake 3.18.4 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3489fff
ci: remove aarch64 builds from CircleCI
AWSjswinney Oct 21, 2020
fbbbefa
Update to CMake 3.18.4
AWSjswinney Oct 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 0 additions & 16 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ references:
- image: dockcross/manylinux1-x86
<<: *ci_steps

aarch64_build_job: &aarch64_build_job
docker:
- image: dockcross/manylinux2014-aarch64
<<: *ci_steps

no_filters: &no_filters
filters:
tags:
Expand All @@ -60,10 +55,6 @@ jobs:
manylinux-x86_cp37-cp37m:
<<: *x86_build_job

# aarch64
manylinux-aarch64_cp37-cp37m:
<<: *aarch64_build_job

deploy-master:
docker:
- image: circleci/python:3.7.0-stretch
Expand Down Expand Up @@ -105,9 +96,6 @@ workflows:
<<: *no_filters
- manylinux-x86_cp37-cp37m:
<<: *no_filters
# aarch64
- manylinux-aarch64_cp37-cp37m:
<<: *no_filters

- deploy-master:
requires:
Expand All @@ -117,8 +105,6 @@ workflows:
# x86
- manylinux-x86_cp27-cp27mu
- manylinux-x86_cp37-cp37m
# aarch64
- manylinux-aarch64_cp37-cp37m
filters:
branches:
only: master
Expand All @@ -130,8 +116,6 @@ workflows:
# x86
- manylinux-x86_cp27-cp27mu
- manylinux-x86_cp37-cp37m
# aarch64
- manylinux-aarch64_cp37-cp37m
filters:
tags:
only: /^[0-9]+(\.[0-9]+)*(\.post[0-9]+)?$/
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ matrix:
- PYTHON_VERSION=2.7.15

- os: linux
arch: arm64
arch: arm64-graviton2
virt: vm
group: edge
dist: focal
Expand Down
24 changes: 12 additions & 12 deletions CMakeUrls.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@

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

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

#-----------------------------------------------------------------------------
# CMake binaries

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

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

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

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

set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2-win64-x64.zip")
set(win64_binary_sha256 "5f4ec834fbd9b62fbf73bc48ed459fa2ea6a86c403106c90fedc2ac76d51612d")
set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4-win64-x64.zip")
set(win64_binary_sha256 "a932bc0c8ee79f1003204466c525b38a840424d4ae29f9e5fb88959116f2407d")
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The suite of CMake tools were created by Kitware in response to the need
for a powerful, cross-platform build environment for open-source projects
such as ITK and VTK.

The CMake python wheels provide `CMake 3.18.2 <https://cmake.org/cmake/help/v3.18/index.html>`_.
The CMake python wheels provide `CMake 3.18.4 <https://cmake.org/cmake/help/v3.18/index.html>`_.

Latest Release
--------------
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The suite of CMake tools were created by Kitware in response to the need
for a powerful, cross-platform build environment for open-source projects
such as `ITK <https://www.itk.org>`_ and `VTK <http://www.vtk.org>`_.

The CMake python wheels provide `CMake 3.18.2 <https://cmake.org/cmake/help/v3.18/index.html>`_.
The CMake python wheels provide `CMake 3.18.4 <https://cmake.org/cmake/help/v3.18/index.html>`_.

.. toctree::
:maxdepth: 2
Expand Down
2 changes: 1 addition & 1 deletion tests/test_distribution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


def _check_cmake_install(virtualenv, tmpdir):
expected_version = "3.18.2"
expected_version = "3.18.4"

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