Skip to content

Commit 38f13e6

Browse files
authored
Merge pull request scikit-build#82 from henryiii/update-to-cmake-3.15.2
Update to CMake 3.15.3
2 parents aa9a0fd + ae33718 commit 38f13e6

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

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.14.4/cmake-3.14.4.tar.gz")
5-
set(unix_source_sha256 "00b4dc9b0066079d10f16eed32ec592963a44e7967371d2f5077fd1670ff36d9")
4+
set(unix_source_url "https://github.com/Kitware/CMake/releases/download/v3.15.3/cmake-3.15.3.tar.gz")
5+
set(unix_source_sha256 "13958243a01365b05652fa01b21d40fa834f70a9e30efa69c02604e64f58b8f5")
66

7-
set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.14.4/cmake-3.14.4.zip")
8-
set(windows_source_sha256 "c33bf2dc5fabd4c86566eed62942ba18e05194dbbe5fe62b0d11882a2468ab63")
7+
set(windows_source_url "https://github.com/Kitware/CMake/releases/download/v3.15.3/cmake-3.15.3.zip")
8+
set(windows_source_sha256 "0c70e4b50aba829d9283ad77af1ca58d976fcd2811cdb99687be55be427daad9")
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.14.4/cmake-3.14.4-Linux-x86_64.tar.gz")
17-
set(linux64_binary_sha256 "9f414df8e432c4a143c2d6d81e170581badba8d89df1cf8944735b9122765c50")
16+
set(linux64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.15.3/cmake-3.15.3-Linux-x86_64.tar.gz")
17+
set(linux64_binary_sha256 "020812a9f87293482cec51fdf44f41cc47e794de568f945a8175549d997e1760")
1818

19-
set(macosx_binary_url "https://github.com/Kitware/CMake/releases/download/v3.14.4/cmake-3.14.4-Darwin-x86_64.tar.gz")
20-
set(macosx_binary_sha256 "8a0c98869cb1e74e31c401a9ecf7a7cacbcfe9d4e7944f434e2f1d3995fefdf4")
19+
set(macosx_binary_url "https://github.com/Kitware/CMake/releases/download/v3.15.3/cmake-3.15.3-Darwin-x86_64.tar.gz")
20+
set(macosx_binary_sha256 "f5edcf630ef6b1fb6c81ea971e043318b5d4776678701e479841fb58a9c25236")
2121

22-
set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.14.4/cmake-3.14.4-win32-x86.zip")
23-
set(win32_binary_sha256 "37faf7051c6318927b67ee1bf7e0c8d34b7159679d38e80ad860f833f92a096f")
22+
set(win32_binary_url "https://github.com/Kitware/CMake/releases/download/v3.15.3/cmake-3.15.3-win32-x86.zip")
23+
set(win32_binary_sha256 "711828fa6744041ea399bbe32e18472a1894594f8b08ce1d96a9cc2d20fcbc18")
2424

25-
set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.14.4/cmake-3.14.4-win64-x64.zip")
26-
set(win64_binary_sha256 "7a0901a26a987259f720ca763ede1dff8161b7024488a89d2aa497e5e1508f5e")
25+
set(win64_binary_url "https://github.com/Kitware/CMake/releases/download/v3.15.3/cmake-3.15.3-win64-x64.zip")
26+
set(win64_binary_sha256 "a18d96b7839ac3294e5e9f464f0af4c8336a16cd5f95e69a90a259207d7e5177")

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

2020
.. toctree::
2121
:maxdepth: 2

scikit-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ test:
7171
convert_to_generic_platform_wheel(wheel, remove_original=True)
7272
- python setup.py test
7373

74-
after_test:
75-
commands:
76-
- codecov -X gcov --required --file ./tests/coverage.xml
74+
#after_test:
75+
# commands:
76+
# - codecov -X gcov --required --file ./tests/coverage.xml

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.14.4"
12+
expected_version = "3.15.3"
1313

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

0 commit comments

Comments
 (0)