Browse Source

Update provision scripts to use CMake 3.6.1 and download the package on Linux.

pull/683/merge
João Matos 9 years ago
parent
commit
1893c61537
  1. 14
      build/scripts/Provision.lua

14
build/scripts/Provision.lua

@ -37,7 +37,7 @@ function download_cmake() @@ -37,7 +37,7 @@ function download_cmake()
error("Error downloading CMake for unknown system")
end
local url = "https://cmake.org/files/v3.6/cmake-3.6.0-" .. system
local url = "https://cmake.org/files/v3.6/cmake-3.6.1-" .. system
local file = "cmake" .. path.getextension(system)
if not os.isfile(file) then
@ -63,10 +63,6 @@ function provision_linux() @@ -63,10 +63,6 @@ function provision_linux()
sudo("apt-key adv --keyserver http://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF")
sudo("echo \"deb http://download.mono-project.com/repo/debian wheezy main\" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list")
if is_vagrant() then
sudo("add-apt-repository -y ppa:george-edison55/cmake-3.x")
end
sudo("apt-get update")
-- Build tools
@ -77,7 +73,8 @@ function provision_linux() @@ -77,7 +73,8 @@ function provision_linux()
-- LLVM/Clang build tools
if compile_llvm then
sudo("apt-get install -y cmake ninja-build")
sudo("apt-get install -y ninja-build")
download_cmake()
end
end
@ -96,6 +93,11 @@ function provision_osx() @@ -96,6 +93,11 @@ function provision_osx()
download_cmake()
end
if _ACTION == "cmake" then
download_cmake()
os.exit()
end
if _ACTION == "provision" then
if os.is("linux") then
provision_linux()

Loading…
Cancel
Save