cmake changes? dunno if i broke anything but at least paths are right now?
This commit is contained in:
parent
17f62e4827
commit
9d8fccc2e3
|
|
@ -1,10 +1,5 @@
|
|||
|
||||
|
||||
idf_component_register(
|
||||
SRCS "placeholder.c"
|
||||
INCLUDE_DIRS ""
|
||||
PRIV_REQUIRES "${RUST_DEPS}"
|
||||
)
|
||||
|
||||
set(CARGO_BUILD_TYPE "release")
|
||||
set(CARGO_BUILD_ARG "--release")
|
||||
|
|
@ -20,11 +15,16 @@ set(RUST_PROJECT_DIR "${CMAKE_CURRENT_LIST_DIR}")
|
|||
set(RUST_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}")
|
||||
set(RUST_TARGET_DIR "${RUST_BUILD_DIR}/target")
|
||||
set(RUST_INCLUDE_DIR "${RUST_TARGET_DIR}")
|
||||
set(RUST_INCLUDE_HEADER "${RUST_INCLUDE_DIR}/RustApi.h")
|
||||
set(RUST_INCLUDE_HEADER "${RUST_INCLUDE_DIR}/drone_controller.h")
|
||||
set(RUST_STATIC_LIBRARY "${RUST_TARGET_DIR}/${CARGO_TARGET}/${CARGO_BUILD_TYPE}/libdrone_controller.a")
|
||||
|
||||
idf_build_get_property(sdkconfig SDKCONFIG)
|
||||
|
||||
idf_component_register(
|
||||
SRCS "placeholder.c"
|
||||
INCLUDE_DIRS "" "${RUST_INCLUDE_DIR}"
|
||||
PRIV_REQUIRES "${RUST_DEPS}"
|
||||
)
|
||||
idf_build_get_property(sdkconfig SDKCONFIG)
|
||||
ExternalProject_Add(
|
||||
drone_controller_project
|
||||
PREFIX "${RUST_PROJECT_DIR}"
|
||||
|
|
@ -57,7 +57,7 @@ ExternalProject_Add(
|
|||
set_source_files_properties("${RUST_INCLUDE_HEADER}" PROPERTIES GENERATED true)
|
||||
|
||||
add_prebuilt_library(drone_controller_lib "${RUST_STATIC_LIBRARY}" PRIV_REQUIRES "${RUST_DEPS}")
|
||||
add_dependencies(drone_controller_lib rustlib_project)
|
||||
add_dependencies(drone_controller_lib drone_codrone_controllerr_project)
|
||||
|
||||
target_include_directories(${COMPONENT_LIB} PUBLIC "${RUST_INCLUDE_DIR}")
|
||||
target_link_libraries(${COMPONENT_LIB} PRIVATE drone_controller_lib)
|
||||
|
|
|
|||
Loading…
Reference in New Issue