facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-12-28 15:44:27 +03:00
Code Issues Projects Releases Wiki Activity

cmake: update RustStaticLibrary.cmake to hook up cargo dependencies

Browse Source 
Summary:
Update `RustStaticLibrary.cmake` to let CMake know that running `cargo` will
produce the Rust static library output.  Without this CMake does not know how
to correctly wire up dependencies for libraries.  Previously the code used the
`ALL` target to ensure that the Rust static library was built, but this did
not ensure that it was built before executables that require it.

Reviewed By: pkaush

Differential Revision: D18588010

fbshipit-source-id: 1a1880993bdfa3fcb876a0f6507e5cddfea9b738
This commit is contained in:
Adam Simpkins 2019-11-20 12:26:31 -08:00 committed by Facebook Github Bot
parent 55d980ee42
commit 344661b651
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eden/scm/CMake/RustStaticLibrary.cmake
View File

@ -120,7 +120,7 @@ function(rust_static_library TARGET)
endif()
add_custom_target(
${cargo_target} ALL
${cargo_target}
COMMAND
"${CMAKE_COMMAND}" -E env
"CARGO_TARGET_DIR=${CMAKE_CURRENT_BINARY_DIR}"
@ -128,6 +128,9 @@ function(rust_static_library TARGET)
${cargo_cmd}
COMMENT "Building Rust crate '${crate_name}'..."
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
BYPRODUCTS
"${CMAKE_CURRENT_BINARY_DIR}/debug/${staticlib_name}"
"${CMAKE_CURRENT_BINARY_DIR}/release/${staticlib_name}"
)
add_library(${TARGET} INTERFACE)