Merge branch 'imbris/pin-cmake' into 'master'

Pin cmake crate to 0.1.45

See merge request veloren/veloren!3024
This commit is contained in:
Imbris 2021-11-21 15:21:32 +00:00
commit 6e168f186b
2 changed files with 6 additions and 2 deletions

5
Cargo.lock generated
View File

@ -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",

View File

@ -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"}