From 0beee173706291627a39900ead3277d46939ee75 Mon Sep 17 00:00:00 2001 From: Imbris Date: Sun, 21 Nov 2021 09:51:39 -0500 Subject: [PATCH] Pin cmake crate to 0.1.45, since the newer version uses the --parallel argument which is not available on our CI's cmake version --- Cargo.lock | 5 +++-- voxygen/Cargo.toml | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1328bfc168..f846aaad7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -658,9 +658,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.46" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b858541263efe664aead4a5209a4ae5c5d2811167d4ed4ee0944503f8d2089" +checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855" dependencies = [ "cc", ] @@ -6364,6 +6364,7 @@ dependencies = [ "bytemuck", "chrono", "chumsky", + "cmake", "conrod_core", "conrod_winit", "copy_dir", diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index 45b353a2cd..8439a3a754 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -56,6 +56,9 @@ wgpu = { version = "=0.8.0", features = ["trace", "cross"] } wgpu-profiler = { git = "https://github.com/Imberflur/wgpu-profiler", tag = "wgpu-0.8" } bytemuck = { version="1.4", features=["derive"] } shaderc = "0.6.2" +# cmake crate used by shaderc, newer version 0.1.46 uses a new cmake command that is not available in our CI cmake version +# see https://github.com/alexcrichton/cmake-rs/issues/131 +cmake = "=0.1.45" # Ui conrod_core = {git = "https://gitlab.com/veloren/conrod.git", branch="copypasta_0.7"}