Skip to content

Commit 2d8d16a

Browse files
committed
Merge branch 'package-cmake-3.7.0'
* package-cmake-3.7.0: Update to version CMake 3.7.0
2 parents af62646 + 12649c8 commit 2d8d16a

File tree

4 files changed

+22
-17
lines changed

4 files changed

+22
-17
lines changed

CMakeLists.txt

+19-14
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,29 @@ if(CMakePythonDistributions_SUPERBUILD)
3434

3535
#-----------------------------------------------------------------------------
3636
# CMake sources
37-
set(unix_source_url "https://cmake.org/files/v3.6/cmake-3.6.2.tar.gz")
38-
set(unix_source_sha256 "189ae32a6ac398bb2f523ae77f70d463a6549926cde1544cd9cc7c6609f8b346")
37+
set(unix_source_url "https://cmake.org/files/v3.7/cmake-3.7.0.tar.gz")
38+
set(unix_source_sha256 "ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31")
3939

40-
set(windows_source_url "https://cmake.org/files/v3.6/cmake-3.6.2.zip")
41-
set(windows_source_sha256 "ccf93db0527c35676ab74319bb3ef1ef4f5149d3b09aab1a58559143c1f4f673")
40+
set(windows_source_url "https://cmake.org/files/v3.7/cmake-3.7.0.zip")
41+
set(windows_source_sha256 "e147c8f95b31b8cb0ef903b39ac21c9f07faf1c2131f7ec54a55e664d70224e7")
4242

4343
#-----------------------------------------------------------------------------
4444
# CMake binaries
45-
set(linux32_binary_url "https://cmake.org/files/v3.6/cmake-3.6.2-Linux-i386.tar.gz")
46-
set(linux32_binary_sha256 "26c2c86ddd54fd143594b6801a677f0a75bbacf7bb006a274d2854d0004f2749")
4745

48-
set(linux64_binary_url "https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz")
49-
set(linux64_binary_sha256 "5df4b69d9e85093ae78b1070d5cb9f824ce0bdd02528948c3f6a740e240083e5")
46+
set(linux32_binary_url "NA") # Linux 32-bit binaries not available
47+
set(linux32_binary_sha256 "NA")
5048

51-
set(macosx_binary_url "https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz")
52-
set(macosx_binary_sha256 "e3ac82120298095245c9948eb11ddfb4b552f5f056ce0ec3c82e3f3a15c53752")
49+
set(linux64_binary_url "https://cmake.org/files/v3.7/cmake-3.7.0-Linux-x86_64.tar.gz")
50+
set(linux64_binary_sha256 "e075f63e6a9104b1c3d11666ae9546bc8812f7e791a49c4ce11effc063141b2a")
5351

54-
set(win32_binary_url "https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip")
55-
set(win32_binary_sha256 "613eec5a8b2e2c49826e0e8e18f516b6f2b481309ae55925d226ce8ab78b0fba")
52+
set(macosx_binary_url "https://cmake.org/files/v3.7/cmake-3.7.0-Darwin-x86_64.tar.gz")
53+
set(macosx_binary_sha256 "38ea6955fb8c120eada1ff7985389b61ad5ca60a90a51025024638d92bfb43cf")
5654

57-
set(win64_binary_url "https://cmake.org/files/v3.6/cmake-3.6.2-win64-x64.zip")
58-
set(win64_binary_sha256 "61337a0528fc3902d7f2f7594959aa6aa48a52863dd2da335a0e248b5eb8acaf")
55+
set(win32_binary_url "https://cmake.org/files/v3.7/cmake-3.7.0-win32-x86.zip")
56+
set(win32_binary_sha256 "26dc1e0c4e9ba6021ed171463f7c99b241c1c8f8ada4ea652f031ff835c6b928")
57+
58+
set(win64_binary_url "https://cmake.org/files/v3.7/cmake-3.7.0-win64-x64.zip")
59+
set(win64_binary_sha256 "11a2f8c4d52c5dbb6708a80f54d782fdfb2f5cd96c091ac51500c5607534e660")
5960

6061
#-----------------------------------------------------------------------------
6162
# Which archives ?
@@ -211,6 +212,10 @@ if(CMakePythonDistributions_SUPERBUILD)
211212
# CMakeProject_BINARY_DISTRIBUTION_DIR
212213
#
213214

215+
if(${binary_archive}_sha256 STREQUAL "NA")
216+
message(FATAL_ERROR "Pre-built archives not available for '${binary_archive}'. Consider setting BUILD_CMAKE_FROM_SOURCE to ON.")
217+
endif()
218+
214219
set(CMakeProject_BINARY_DISTRIBUTION_DIR "${CMAKE_BINARY_DIR}/CMakeProject-binary-distribution")
215220

216221
# Download selected binary archive

README.rst

+1-1
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.6.2 <https://cmake.org/cmake/help/v3.6/index.html>`_.
23+
The CMake python wheels provide `CMake 3.7.0 <https://cmake.org/cmake/help/v3.7/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

+1-1
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 and VTK.
1717

18-
The CMake python wheels provide `CMake 3.6.2 <https://cmake.org/cmake/help/v3.6/index.html>`_.
18+
The CMake python wheels provide `CMake 3.7.0 <https://cmake.org/cmake/help/v3.6/index.html>`_.
1919

2020
.. toctree::
2121
:maxdepth: 2

tests/test_wheel.py

+1-1
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.6.2"
16+
expected_version = "3.7.0"
1717

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

0 commit comments

Comments
 (0)