From f2693752f1a679ef1c0cf102ec43a94db62fc831 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 3 Nov 2023 14:19:52 +0800 Subject: [PATCH] build: cmake: avoid referencing CMAKE_BUILD_TYPE use generator-expresion instead, so that the value can be evaluated when generating the build system. this prepares for the multi-config support. Signed-off-by: Kefu Chai Closes scylladb/scylladb#15942 --- rust/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rust/CMakeLists.txt b/rust/CMakeLists.txt index 733eaa2a1e..1ab26a1a01 100644 --- a/rust/CMakeLists.txt +++ b/rust/CMakeLists.txt @@ -3,19 +3,19 @@ find_program(CARGO cargo function(add_rust_library name) # use for profiles defined in Cargo.toml - set(mode ${CMAKE_BUILD_TYPE}) - string(TOLOWER ${CMAKE_BUILD_TYPE} mode) + set(mode $>) set(target_dir ${CMAKE_CURRENT_BINARY_DIR}) set(profile "rust-${mode}") - set(library ${target_dir}/${profile}/lib${name}.a) + set(library ${target_dir}/lib${name}.a) add_custom_command( OUTPUT ${library} COMMAND ${CMAKE_COMMAND} -E env CARGO_BUILD_DEP_INFO_BASEDIR=. ${CARGO} build --locked --target-dir=${target_dir} --profile=rust-${mode} + COMMAND ${CMAKE_COMMAND} -E copy ${target_dir}/${profile}/lib${name}.a ${library} DEPENDS Cargo.lock WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Building Rust library: ${library}") add_custom_target(rust-${name} - DEPENDS ${library}) + DEPENDS ${target_dir}/lib${name}.a) add_library(Rust::${name} STATIC IMPORTED) add_dependencies(Rust::${name} rust-${name}) set_target_properties(Rust::${name} PROPERTIES