fix the build, and order of CMakeList sections

Author: xianshijing-lk

CMakeLists.txt

@@ -46,6 +46,44 @@ protobuf_generate(
   IMPORT_DIRS ${FFI_PROTO_DIR}
 )
 
+########### auto-gen build.h #######################
+
+# Where to place the generated header
+set(GENERATED_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
+file(MAKE_DIRECTORY "${GENERATED_INCLUDE_DIR}")
+
+# Try to capture git commit; fall back to "unknown" if git isn't available or repo isn't present.
+set(GIT_COMMIT "unknown")
+find_package(Git QUIET)
+if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
+  execute_process(
+    COMMAND "${GIT_EXECUTABLE}" rev-parse --short HEAD
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+    OUTPUT_VARIABLE GIT_COMMIT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
+  )
+endif()
+
+# Build timestamp
+string(TIMESTAMP BUILD_DATE "%Y-%m-%d %H:%M:%S")
+
+# Comment shown at the top of the generated header
+set(GENERATED_COMMENT "This file was auto-generated by CMake on ${LIVEKIT_BUILD_DATE}. Do NOT edit manually. Edit build.h.in instead.")
+
+# Generate the header from the template
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/build.h.in"
+  "${GENERATED_INCLUDE_DIR}/build.h"
+  @ONLY
+)
+
+# Include the directory for the headers
+include_directories("${GENERATED_INCLUDE_DIR}")
+
+
+########### Livekit Rust SDK #######################
+
 # Find cargo
 find_program(CARGO_EXECUTABLE NAMES cargo REQUIRED)
 
@@ -129,6 +167,7 @@ target_include_directories(livekit PUBLIC
   ${CMAKE_SOURCE_DIR}/src
   ${RUST_ROOT}/livekit-ffi/include
   ${PROTO_BINARY_DIR}
+  ${GENERATED_INCLUDE_DIR}
 )
 
 target_link_libraries(livekit
@@ -143,45 +182,6 @@ message(STATUS "Protobuf: version=${Protobuf_VERSION}; protoc=${Protobuf_PROTOC_
 add_dependencies(livekit build_rust_ffi)
 
 
-########### auto-gen build.h #######################
-
-# Where to place the generated header
-set(GENERATED_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
-file(MAKE_DIRECTORY "${GENERATED_INCLUDE_DIR}")
-
-# Try to capture git commit; fall back to "unknown" if git isn't available or repo isn't present.
-set(GIT_COMMIT "unknown")
-find_package(Git QUIET)
-if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
-  execute_process(
-    COMMAND "${GIT_EXECUTABLE}" rev-parse --short HEAD
-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-    OUTPUT_VARIABLE GIT_COMMIT
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    ERROR_QUIET
-  )
-endif()
-
-# Build timestamp
-string(TIMESTAMP BUILD_DATE "%Y-%m-%d %H:%M:%S")
-
-# Comment shown at the top of the generated header
-set(GENERATED_COMMENT "This file was auto-generated by CMake on ${LIVEKIT_BUILD_DATE}. Do NOT edit manually. Edit build.h.in instead.")
-
-# Generate the header from the template
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/build.h.in"
-  "${GENERATED_INCLUDE_DIR}/build.h"
-  @ONLY
-)
-
-# Make the generated header available to your targets:
-# (Option A) Global include dir
-include_directories("${GENERATED_INCLUDE_DIR}")
-
-# (Option B) Or, per-target (recommended):
-# target_include_directories(<your_target> PRIVATE "${GENERATED_INCLUDE_DIR}")
-
 ########### Platform specific settings  ########### 
 
 if(APPLE)

include/livekit/ffi_client.h

@@ -29,8 +29,11 @@
 namespace livekit {
 
 namespace proto {
-class FfiEvent
-}
+class FfiEvent;
+class FfiResponse;
+class FfiRequest;
+class RoomInfo;
+} // namespace proto
 
 using FfiCallbackFn = void (*)(const uint8_t *, size_t);
 extern "C" void livekit_ffi_initialize(FfiCallbackFn cb, bool capture_logs,
@@ -67,8 +70,8 @@ class FfiClient {
   void RemoveListener(ListenerId id);
 
   // Room APIs
-  std::future<livekit::proto::RoomInfo> connectAsync(const std::string &url,
-                                                     const std::string &token);
+  std::future<proto::RoomInfo> connectAsync(const std::string &url,
+                                            const std::string &token);
 
   // Track APIs
   std::future<std::vector<RtcStats>> getTrackStatsAsync(uintptr_t track_handle);