From 9139a14d6b269c4d3dd366959f2e5259bf8fe20f Mon Sep 17 00:00:00 2001 From: KyleMiles Date: Tue, 5 Dec 2023 18:37:21 -0500 Subject: Fix cmake dependency for dwarf import/export --- rust/examples/dwarf/dwarf_export/CMakeLists.txt | 16 ++++++++-------- rust/examples/dwarf/dwarf_import/CMakeLists.txt | 17 +++++++++-------- 2 files changed, 17 insertions(+), 16 deletions(-) (limited to 'rust/examples') diff --git a/rust/examples/dwarf/dwarf_export/CMakeLists.txt b/rust/examples/dwarf/dwarf_export/CMakeLists.txt index b8187e10..5827c1d2 100644 --- a/rust/examples/dwarf/dwarf_export/CMakeLists.txt +++ b/rust/examples/dwarf/dwarf_export/CMakeLists.txt @@ -2,19 +2,19 @@ cmake_minimum_required(VERSION 3.9 FATAL_ERROR) project(dwarf_export) -file(GLOB PLUGIN_SOURCES +file(GLOB PLUGIN_SOURCES CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/Cargo.toml ${PROJECT_SOURCE_DIR}/src/*.rs ${PROJECT_SOURCE_DIR}/../shared/Cargo.toml ${PROJECT_SOURCE_DIR}/../shared/src/*.rs) -file(GLOB API_SOURCES - ${PROJECT_SOURCE_DIR}/../../../binaryninjacore.h - ${PROJECT_SOURCE_DIR}/../../binaryninjacore-sys/build.rs - ${PROJECT_SOURCE_DIR}/../../binaryninjacore-sys/Cargo.toml - ${PROJECT_SOURCE_DIR}/../../binaryninjacore-sys/src/* - ${PROJECT_SOURCE_DIR}/../../Cargo.toml - ${PROJECT_SOURCE_DIR}/../../src/*.rs) +file(GLOB_RECURSE API_SOURCES CONFIGURE_DEPENDS + ${PROJECT_SOURCE_DIR}/../../../../binaryninjacore.h + ${PROJECT_SOURCE_DIR}/../../../binaryninjacore-sys/build.rs + ${PROJECT_SOURCE_DIR}/../../../binaryninjacore-sys/Cargo.toml + ${PROJECT_SOURCE_DIR}/../../../binaryninjacore-sys/src/* + ${PROJECT_SOURCE_DIR}/../../../Cargo.toml + ${PROJECT_SOURCE_DIR}/../../../src/*.rs) if(CMAKE_BUILD_TYPE MATCHES Debug) set(TARGET_DIR ${PROJECT_BINARY_DIR}/target/debug) diff --git a/rust/examples/dwarf/dwarf_import/CMakeLists.txt b/rust/examples/dwarf/dwarf_import/CMakeLists.txt index 0c30fab0..9115b7a3 100644 --- a/rust/examples/dwarf/dwarf_import/CMakeLists.txt +++ b/rust/examples/dwarf/dwarf_import/CMakeLists.txt @@ -2,19 +2,19 @@ cmake_minimum_required(VERSION 3.9 FATAL_ERROR) project(dwarf_import) -file(GLOB PLUGIN_SOURCES +file(GLOB PLUGIN_SOURCES CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/Cargo.toml ${PROJECT_SOURCE_DIR}/src/*.rs ${PROJECT_SOURCE_DIR}/../shared/Cargo.toml ${PROJECT_SOURCE_DIR}/../shared/src/*.rs) -file(GLOB API_SOURCES - ${PROJECT_SOURCE_DIR}/../../../binaryninjacore.h - ${PROJECT_SOURCE_DIR}/../../binaryninjacore-sys/build.rs - ${PROJECT_SOURCE_DIR}/../../binaryninjacore-sys/Cargo.toml - ${PROJECT_SOURCE_DIR}/../../binaryninjacore-sys/src/* - ${PROJECT_SOURCE_DIR}/../../Cargo.toml - ${PROJECT_SOURCE_DIR}/../../src/*.rs) +file(GLOB_RECURSE API_SOURCES CONFIGURE_DEPENDS + ${PROJECT_SOURCE_DIR}/../../../../binaryninjacore.h + ${PROJECT_SOURCE_DIR}/../../../binaryninjacore-sys/build.rs + ${PROJECT_SOURCE_DIR}/../../../binaryninjacore-sys/Cargo.toml + ${PROJECT_SOURCE_DIR}/../../../binaryninjacore-sys/src/* + ${PROJECT_SOURCE_DIR}/../../../Cargo.toml + ${PROJECT_SOURCE_DIR}/../../../src/*.rs) if(CMAKE_BUILD_TYPE MATCHES Debug) set(TARGET_DIR ${PROJECT_BINARY_DIR}/target/debug) @@ -30,6 +30,7 @@ set(PLUGIN_PATH ${TARGET_DIR}/${OUTPUT_FILE}) add_custom_target(dwarf_import ALL DEPENDS ${PLUGIN_PATH}) add_dependencies(dwarf_import binaryninjaapi) + find_program(RUSTUP_PATH rustup REQUIRED HINTS ~/.cargo/bin) if(CARGO_API_VERSION) set(RUSTUP_COMMAND ${RUSTUP_PATH} run ${CARGO_API_VERSION} cargo build) -- cgit v1.3.1