summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyleMiles <krm504@nyu.edu>2023-12-05 18:37:21 -0500
committerKyleMiles <krm504@nyu.edu>2023-12-05 19:01:49 -0500
commit9139a14d6b269c4d3dd366959f2e5259bf8fe20f (patch)
treedcf5817d087c9391f22bc51ee2ae86c2ecc88e04
parentae144062dbdb047b924c2071a37a8154864cb07b (diff)
Fix cmake dependency for dwarf import/export
-rw-r--r--rust/examples/dwarf/dwarf_export/CMakeLists.txt16
-rw-r--r--rust/examples/dwarf/dwarf_import/CMakeLists.txt17
2 files changed, 17 insertions, 16 deletions
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)