Skip to content

Commit ea044cd

Browse files
Revert "update CMake to work with newest rust hash"
This reverts commit ae4b2de.
1 parent 7d47ebe commit ea044cd

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,6 @@ execute_process(
268268
if(rv)
269269
message(FATAL_ERROR \"cargo build failed with code: \${rv}\")
270270
endif()
271-
272-
if(DEFINED EXPECTED_OUTPUT AND NOT EXPECTED_OUTPUT STREQUAL \"\" AND NOT EXISTS \"\${EXPECTED_OUTPUT}\")
273-
message(FATAL_ERROR \"cargo build completed but did not produce expected Rust FFI artifact: \${EXPECTED_OUTPUT}\")
274-
endif()
275271
")
276272

277273
# Use SHARED library (DLL) on Windows to isolate /MT CRT from consuming /MD apps
@@ -339,25 +335,23 @@ file(GLOB_RECURSE RUST_SOURCES
339335
)
340336

341337
add_custom_command(
342-
OUTPUT "${LIVEKIT_BINARY_DIR}/rust_ffi_$<CONFIG>.stamp"
338+
OUTPUT "${RUST_LIB_DEBUG}" "${RUST_LIB_RELEASE}"
343339
COMMAND "${CMAKE_COMMAND}"
344340
-DCFG=$<CONFIG>
345341
-DRUST_ROOT=${RUST_ROOT}
346342
-DCARGO=${CARGO_EXECUTABLE}
347343
-DPROTOC_PATH=${Protobuf_PROTOC_EXECUTABLE}
348344
-DRUST_TARGET=${RUST_TARGET_TRIPLE}
349345
-DGCC_LIB_DIR=${GCC_LIB_DIR}
350-
-DEXPECTED_OUTPUT=$<IF:$<CONFIG:Debug>,${RUST_LIB_DEBUG},${RUST_LIB_RELEASE}>
351346
-P "${RUN_CARGO_SCRIPT}"
352-
COMMAND "${CMAKE_COMMAND}" -E touch "${LIVEKIT_BINARY_DIR}/rust_ffi_$<CONFIG>.stamp"
353347
WORKING_DIRECTORY "${RUST_ROOT}"
354348
DEPENDS ${RUST_SOURCES}
355349
COMMENT "Building Rust FFI via cargo"
356350
VERBATIM
357351
)
358352

359353
add_custom_target(build_rust_ffi
360-
DEPENDS "${LIVEKIT_BINARY_DIR}/rust_ffi_$<CONFIG>.stamp"
354+
DEPENDS "${RUST_LIB_DEBUG}" "${RUST_LIB_RELEASE}"
361355
)
362356

363357
# Note: protozero_plugin.o removal is no longer needed since we use dynamic libraries on Unix

0 commit comments

Comments
 (0)