marrub
/
rust-qt-binding-generator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Look for cargo in the main CMake file

master
Jos van den Oever 2017-08-31 08:53:12 +02:00
parent 96295dec7c
commit 9d2cd5ba08
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -17,6 +17,8 @@ endif()
include(FeatureSummary)
find_program(CARGO cargo)
# Find Qt modules
find_package(Qt5 ${QT_MIN_VERSION} CONFIG
REQUIRED COMPONENTS

2
demo/CMakeLists.txt
View File

@ -43,7 +43,7 @@ add_custom_command(
# compile the rust code into a static library
add_custom_command(
OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/rust/${RUST_TARGET_DIR}/librust.a"
COMMAND cargo build ${RUST_BUILD_FLAG}
COMMAND ${CARGO} build ${RUST_BUILD_FLAG}
DEPENDS rust/src/lib.rs
rust/src/fibonacci_interface.rs
rust/src/fibonacci_implementation.rs

4
tests/CMakeLists.txt
View File

@ -21,7 +21,7 @@ function(rust_test NAME DIRECTORY)
add_custom_command(
OUTPUT "${DIR}/${RUST_TARGET_DIR}/librust.a"
COMMAND cargo build ${RUST_BUILD_FLAG}
COMMAND ${CARGO} build ${RUST_BUILD_FLAG}
DEPENDS "${DIR}/src/lib.rs"
"${DIR}/src/implementation.rs"
"${DIR}/src/interface.rs"
@ -52,7 +52,7 @@ function(rust_test NAME DIRECTORY)
add_custom_command(
OUTPUT "clean_${NAME}"
COMMAND cargo clean
COMMAND ${CARGO} clean
WORKING_DIRECTORY "${DIR}"
)
add_custom_target("clean-${NAME}" DEPENDS "clean_${NAME}")