diff --git a/ci/build_windows.py b/ci/build_windows.py index 526abc9c8cd4..53d435cebee9 100755 --- a/ci/build_windows.py +++ b/ci/build_windows.py @@ -28,6 +28,7 @@ import platform import shutil import sys +import tempfile import time from distutils.dir_util import copy_tree from enum import Enum @@ -143,6 +144,10 @@ def windows_build(args): mxnet_root = get_mxnet_root() logging.info("Found MXNet root: {}".format(mxnet_root)) + with tempfile.TemporaryDirectory() as tmpdir: + cmake_file_path = download_file('https://cmake.org/files/v3.15/cmake-3.15.5-win64-x64.msi', tmpdir) + run_command("msiexec /i {} /quiet /norestart ADD_CMAKE_TO_PATH=System".format(cmake_file_path)) + with remember_cwd(): os.chdir(path) cmd = "\"{}\" && cmake -G \"NMake Makefiles JOM\" {} {}".format(args.vcvars, diff --git a/ci/docker/install/ubuntu_arm.sh b/ci/docker/install/ubuntu_arm.sh index 1e4f371fbe6f..01ce750f90b8 100755 --- a/ci/docker/install/ubuntu_arm.sh +++ b/ci/docker/install/ubuntu_arm.sh @@ -22,3 +22,11 @@ set -ex apt update || true apt install -y \ unzip + +# CMake 3.13.2+ is required +mkdir /opt/cmake && cd /opt/cmake +wget -nv https://cmake.org/files/v3.13/cmake-3.13.5-Linux-x86_64.sh +sh cmake-3.13.5-Linux-x86_64.sh --prefix=/opt/cmake --skip-license +ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake +rm cmake-3.13.5-Linux-x86_64.sh +cmake --version diff --git a/ci/docker/install/ubuntu_core.sh b/ci/docker/install/ubuntu_core.sh index e7ae7e0859d7..70bc285d163b 100755 --- a/ci/docker/install/ubuntu_core.sh +++ b/ci/docker/install/ubuntu_core.sh @@ -57,7 +57,7 @@ apt-get install -y \ ln -s /usr/lib/x86_64-linux-gnu/libturbojpeg.so.0.1.0 /usr/lib/x86_64-linux-gnu/libturbojpeg.so -# CMake 3.13.3+ is required for Cuda builds +# CMake 3.13.2+ is required mkdir /opt/cmake && cd /opt/cmake wget -nv https://cmake.org/files/v3.13/cmake-3.13.5-Linux-x86_64.sh sh cmake-3.13.5-Linux-x86_64.sh --prefix=/opt/cmake --skip-license