Skip to content

Commit 01b5358

Browse files
committed
Merge branch 'update-to-cmake-3.11.0'
* update-to-cmake-3.11.0: scikit-ci.yml: set CMAKE_OSX_SYSROOT to use 10.12 sdk Update to cmake 3.11.0
2 parents 5fb9167 + 81f210b commit 01b5358

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
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://cmake.org/files/v3.10/cmake-3.10.1.tar.gz")
5-
set(unix_source_sha256 "7be36ee24b0f5928251b644d29f5ff268330a916944ef4a75e23ba01e7573284")
4+
set(unix_source_url "https://cmake.org/files/v3.11/cmake-3.11.0.tar.gz")
5+
set(unix_source_sha256 "c313bee371d4d255be2b4e96fd59b11d58bc550a7c78c021444ae565709a656b")
66

7-
set(windows_source_url "https://cmake.org/files/v3.10/cmake-3.10.1.zip")
8-
set(windows_source_sha256 "4f1eb69d116574c0c2fddce618b04ce40f56b6920f5dff1b6ecb26a422e9d868")
7+
set(windows_source_url "https://cmake.org/files/v3.11/cmake-3.11.0.zip")
8+
set(windows_source_sha256 "6b250f1ffc2e27545b715512e6ef3d1d99139763b1721c961f1599906288fc08")
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://cmake.org/files/v3.10/cmake-3.10.1-Linux-x86_64.tar.gz")
17-
set(linux64_binary_sha256 "f0f84761a254324ed9076c23fca502eb135ec49c0b752212a6298f317d303438")
16+
set(linux64_binary_url "https://cmake.org/files/v3.11/cmake-3.11.0-Linux-x86_64.tar.gz")
17+
set(linux64_binary_sha256 "5babc7953b50715028a05823d18fd91b62805b10aa7811e5fd02b27224d60f10")
1818

19-
set(macosx_binary_url "https://cmake.org/files/v3.10/cmake-3.10.1-Darwin-x86_64.tar.gz")
20-
set(macosx_binary_sha256 "8684f9e084fe4a5565dd2b9538ba843832acb207955e71047a686219f928fb3d")
19+
set(macosx_binary_url "https://cmake.org/files/v3.11/cmake-3.11.0-Darwin-x86_64.tar.gz")
20+
set(macosx_binary_sha256 "1ea5e27da42817ed80f4bc99bff36acc364420579f6e6d3e59ef5906c67a8286")
2121

22-
set(win32_binary_url "https://cmake.org/files/v3.10/cmake-3.10.1-win32-x86.zip")
23-
set(win32_binary_sha256 "6fe010cce1201d884cd7a9535db8a1f16d98b8965341251fde8f1c5069ee58c0")
22+
set(win32_binary_url "https://cmake.org/files/v3.11/cmake-3.11.0-win32-x86.zip")
23+
set(win32_binary_sha256 "c473db9e18c1f27024820df917aa2d9d460f69d4cb0305fbf5da7f96ce99754c")
2424

25-
set(win64_binary_url "https://cmake.org/files/v3.10/cmake-3.10.1-win64-x64.zip")
26-
set(win64_binary_sha256 "8251f70c85b58f3ca1f24e4a3b0637e2d609b5e4a341d00b70e02e89244d5029")
25+
set(win64_binary_url "https://cmake.org/files/v3.11/cmake-3.11.0-win64-x64.zip")
26+
set(win64_binary_sha256 "e776f4d310b8bc144ab66c3365bfbbd1dcfaad23a13ed0d4929a88a3f4b2bb62")

README.rst

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

23-
The CMake python wheels provide `CMake 3.10.1 <https://cmake.org/cmake/help/v3.10/index.html>`_.
23+
The CMake python wheels provide `CMake 3.11.0 <https://cmake.org/cmake/help/v3.11/index.html>`_.
2424

2525
This project is maintained by Jean-Christophe Fillion-Robin from Kitware Inc.
2626
It is covered by the `Apache License, Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0>`_.

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.10.1 <https://cmake.org/cmake/help/v3.10/index.html>`_.
18+
The CMake python wheels provide `CMake 3.11.0 <https://cmake.org/cmake/help/v3.11/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
@@ -19,7 +19,7 @@ before_install:
1919
osx:
2020
environment:
2121
PATH: $<HOME>/.pyenv/versions/$<PYTHON_VERSION>/bin:$<PATH>
22-
SETUP_ARGS: --plat-name macosx-10.6-x86_64 -- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6 -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk
22+
SETUP_ARGS: --plat-name macosx-10.6-x86_64 -- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6 -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk
2323
commands:
2424
- python ../addons/travis/install_pyenv.py
2525
- python ../addons/travis/install_cmake.py 3.6.2

tests/test_wheel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def test_command_line(virtualenv, tmpdir):
1313

1414
virtualenv.run("pip install %s" % wheels[0])
1515

16-
expected_version = "3.10.1"
16+
expected_version = "3.11.0"
1717

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

0 commit comments

Comments
 (0)