Commit 98b5ca39 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'macos11-support'

fbd23ad9 ci: update cmake to 3.19.4
b5e499a7 cmake: add a warning about packaging on macOS 11 and old CMake
9f6b0526

 superbuild: bump for macOS 11 packaging support
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: David Thompson's avatarDavid Thompson <david.thompson@kitware.com>
Merge-request: !721
parents 5247d296 fbd23ad9
Pipeline #212791 failed with stages
$erroractionpreference = "stop"
$version = "3.17.3"
$sha256sum = "8A02DE221AA96C236A947B28CA1BD6327B9BB82FA74B91E5CAA49FFD6A642AE2"
$version = "3.19.4"
$sha256sum = "24B03DAF75CE59B542DA38C829FE6944D3BF7CF99AFAA8225CF29F7876823899"
$filename = "cmake-$version-win64-x64"
$tarball = "$filename.zip"
......
......@@ -2,18 +2,20 @@
set -e
readonly version="3.17.3"
readonly version="3.19.4"
case "$( uname -s )" in
Linux)
shatool="sha256sum"
sha256sum="da8093956f0b4ae30293c9db498da9bdeaeea4e7a2b1f2d1637ddda064d06dd0"
sha256sum="ff23e1f53c53e8ef1fa87568345031d86c504e53efb52fa487db0b8e0ee4d3ff"
platform="Linux"
arch="x86_64"
;;
Darwin)
shatool="shasum -a 256"
sha256sum="2ad1413510681b041ec305923c6ccbc64b0fed6608df82f5543577f7b4b88305"
platform="Darwin"
sha256sum="eb1f52996632c1e71a1051c9e2c30cc8df869fb5a213b1a0d3b202744c6c5758"
platform="macos"
arch="universal"
;;
*)
echo "Unrecognized platform $( uname -s )"
......@@ -23,8 +25,9 @@ esac
readonly shatool
readonly sha256sum
readonly platform
readonly arch
readonly filename="cmake-$version-$platform-x86_64"
readonly filename="cmake-$version-$platform-$arch"
readonly tarball="$filename.tar.gz"
cd .gitlab
......
......@@ -2,6 +2,14 @@ cmake_minimum_required(VERSION 3.11.2)
project(cmb-superbuild)
if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND
NOT CMAKE_HOST_SYSTEM_VERSION VERSION_LESS "20.2.0" # macOS 11
AND CMAKE_VERSION VERSION_LESS "3.19.0")
message(AUTHOR_WARNING
"Note that macOS 11 has changes which requires CMake 3.19.0 to "
"successfully package the applications.")
endif ()
list(INSERT CMAKE_MODULE_PATH 0
"${CMAKE_CURRENT_LIST_DIR}/cmake")
......
Subproject commit 1db8fb15d93750198a27ba076ad90e62144929ae
Subproject commit de05ef687243cc8cb57041b38acd7e7458edff82
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment