Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove a CMake 3.19 construct

Browse source 
CONFIG supports multiple arguments only as of CMake 3.19, see
https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html#configuration-expressions

Ubuntu focal ships with 3.16 by default, so enable building with that.
Note that there is also the workaround of installing "cmake-mozilla".
This commit is contained in:
Johannes Altmanninger 2024-08-04 13:00:00 +02:00
parent 615b413335
commit f71233ae02
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -56,7 +56,8 @@ function(CREATE_TARGET target)
env ${VARS_FOR_CARGO} env ${VARS_FOR_CARGO}
${Rust_CARGO} ${Rust_CARGO}
build --bin ${target} build --bin ${target}
$<$<CONFIG:Release,RelWithDebInfo>:--release> $<$<CONFIG:Release>:--release>
$<$<CONFIG:RelWithDebInfo>:--release>
--target ${Rust_CARGO_TARGET} --target ${Rust_CARGO_TARGET}
${CARGO_FLAGS} ${CARGO_FLAGS}
${FEATURES_ARG} ${FEATURES_ARG}

2
cmake/Rust.cmake
View file

@ -19,7 +19,7 @@ else()
endif() endif()
set(rust_profile $<IF:$<CONFIG:Debug>,debug,release>) set(rust_profile $<IF:$<CONFIG:Debug>,debug,release>)
set(rust_debugflags "$<$<CONFIG:Debug,RelWithDebInfo>:-g>") set(rust_debugflags "$<$<CONFIG:Debug>:-g>$<$<CONFIG:RelWithDebInfo>:-g>")
# Temporary hack to propogate CMake flags/options to build.rs. We need to get CMake to evaluate the # Temporary hack to propogate CMake flags/options to build.rs. We need to get CMake to evaluate the