Fix some misc Rust CMakeLists.txt issues

GLOB_RECURSE has been cut down a little bit to make configuring times reasonable

Author: emesare

plugins/idb_import/CMakeLists.txt

@@ -6,13 +6,13 @@ file(GLOB_RECURSE PLUGIN_SOURCES CONFIGURE_DEPENDS
         ${PROJECT_SOURCE_DIR}/Cargo.toml
         ${PROJECT_SOURCE_DIR}/src/*.rs)
 
-file(GLOB_RECURSE API_SOURCES CONFIGURE_DEPENDS
+file(GLOB API_SOURCES CONFIGURE_DEPENDS
         ${PROJECT_SOURCE_DIR}/../../binaryninjacore.h
         ${PROJECT_SOURCE_DIR}/../../rust/binaryninjacore-sys/build.rs
         ${PROJECT_SOURCE_DIR}/../../rust/binaryninjacore-sys/Cargo.toml
         ${PROJECT_SOURCE_DIR}/../../rust/binaryninjacore-sys/src/*
         ${PROJECT_SOURCE_DIR}/../../rust/Cargo.toml
-        ${PROJECT_SOURCE_DIR}/../../rust/src/*.rs)
+        ${PROJECT_SOURCE_DIR}/../../rust/src/*/*.rs)
 
 if(CMAKE_BUILD_TYPE MATCHES Debug)
     set(TARGET_DIR ${PROJECT_BINARY_DIR}/target/debug)

plugins/pdb-ng/CMakeLists.txt

@@ -6,14 +6,6 @@ file(GLOB PLUGIN_SOURCES CONFIGURE_DEPENDS
 	${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}/../../rust/binaryninjacore-sys/build.rs
-	${PROJECT_SOURCE_DIR}/../../rust/binaryninjacore-sys/Cargo.toml
-	${PROJECT_SOURCE_DIR}/../../rust/binaryninjacore-sys/src/*
-	${PROJECT_SOURCE_DIR}/../../rust/Cargo.toml
-	${PROJECT_SOURCE_DIR}/../../rust/src/*.rs)
-
 if(CMAKE_BUILD_TYPE MATCHES Debug)
 	if(DEMO)
 		set(TARGET_DIR ${PROJECT_BINARY_DIR}/target/dev-demo)
@@ -62,6 +54,14 @@ get_target_property(BN_API_SOURCE_DIR binaryninjaapi SOURCE_DIR)
 list(APPEND CMAKE_MODULE_PATH "${BN_API_SOURCE_DIR}/cmake")
 find_package(BinaryNinjaCore REQUIRED)
 
+file(GLOB API_SOURCES CONFIGURE_DEPENDS
+	${BN_API_SOURCE_DIR}/binaryninjacore.h
+	${BN_API_SOURCE_DIR}/rust/binaryninjacore-sys/build.rs
+	${BN_API_SOURCE_DIR}/rust/binaryninjacore-sys/Cargo.toml
+	${BN_API_SOURCE_DIR}/rust/binaryninjacore-sys/src/*
+	${BN_API_SOURCE_DIR}/rust/Cargo.toml
+	${BN_API_SOURCE_DIR}/rust/src/*/*.rs)
+
 set_property(TARGET ${PROJECT_NAME} PROPERTY OUTPUT_FILE_PATH ${OUTPUT_FILE_PATH})
 
 find_program(RUSTUP_PATH rustup REQUIRED HINTS ~/.cargo/bin)

plugins/warp/CMakeLists.txt

@@ -52,10 +52,9 @@ set(BINJA_LIB_DIR ${BN_INSTALL_BIN_DIR})
 set_property(TARGET ${PROJECT_NAME} PROPERTY OUTPUT_FILE_PATH ${OUTPUT_FILE_PATH})
 
 # Add the whole api to the depends too
-file(GLOB_RECURSE API_SOURCES CONFIGURE_DEPENDS
+file(GLOB API_SOURCES CONFIGURE_DEPENDS
         ${BN_API_SOURCE_DIR}/binaryninjacore.h
-        ${BN_API_SOURCE_DIR}/rust/src/*.rs
-        ${BN_API_SOURCE_DIR}/rust/binaryninjacore-sys/src/*.rs)
+        ${BN_API_SOURCE_DIR}/rust/src/*/*.rs)
 
 find_program(RUSTUP_PATH rustup REQUIRED HINTS ~/.cargo/bin)
 set(RUSTUP_COMMAND ${RUSTUP_PATH} run ${CARGO_STABLE_VERSION} cargo)

rust/CMakeLists.txt

@@ -10,7 +10,7 @@ file(GLOB RUST_API_SOURCES CONFIGURE_DEPENDS
 	binaryninjacore-sys/Cargo.toml
 	binaryninjacore-sys/src/*
 	Cargo.toml
-	src/*.rs)
+	src/*/*.rs)
 
 if(CMAKE_BUILD_TYPE MATCHES Debug)
 	set(CARGO_CHECK_OPTS --workspace)