Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ received_green.avif
docs/*.bak
docs/html/
docs/latex/
web/
.vs/
.vscode/
.cursor/
Expand All @@ -29,3 +30,5 @@ lib/
*.dll
*.exe
livekit.log

examples/realsense-livekit/
22 changes: 13 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

option(LIVEKIT_BUILD_EXAMPLES "Build LiveKit examples" OFF)
option(LIVEKIT_BUILD_TESTS "Build LiveKit tests" OFF)
option(LIVEKIT_BUILD_BRIDGE "Build LiveKit Bridge (simplified high-level API)" OFF)


# vcpkg is only used on Windows; Linux/macOS use system package managers
if(WIN32)
Expand Down Expand Up @@ -353,6 +353,14 @@ add_library(livekit SHARED
src/remote_video_track.cpp
src/video_utils.cpp
src/video_utils.h
src/session_manager/session_manager.cpp
src/session_manager/managed_local_audio_track.cpp
src/session_manager/managed_local_video_track.cpp
src/session_manager/session_manager_room_delegate.cpp
src/session_manager/session_manager_room_delegate.h
src/session_manager/rpc_constants.cpp
src/session_manager/rpc_controller.cpp
src/session_manager/rpc_controller.h
)
if(WIN32)
set_target_properties(livekit PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
Expand All @@ -367,15 +375,17 @@ target_include_directories(livekit
$<INSTALL_INTERFACE:include>
PRIVATE
${LIVEKIT_ROOT_DIR}/src
${LIVEKIT_ROOT_DIR}/src/session_manager
${RUST_ROOT}/livekit-ffi/include
${PROTO_BINARY_DIR}
)

target_link_libraries(livekit
PUBLIC
$<BUILD_INTERFACE:spdlog::spdlog>
PRIVATE
livekit_ffi
${LIVEKIT_PROTOBUF_TARGET}
spdlog::spdlog
)

target_compile_definitions(livekit
Expand Down Expand Up @@ -679,19 +689,13 @@ install(FILES

# ------------------------------------------------------------------------

# Build the LiveKit C++ bridge before examples (human_robot depends on it)
add_subdirectory(bridge)

# ---- Examples ----
# add_subdirectory(examples)


if(LIVEKIT_BUILD_EXAMPLES)
add_subdirectory(examples)
endif()

if(LIVEKIT_BUILD_TESTS)
add_subdirectory(src/tests)
add_subdirectory(src/tests/session_manager)
endif()

add_custom_target(clean_generated
Expand Down
61 changes: 0 additions & 61 deletions bridge/CMakeLists.txt

This file was deleted.

185 changes: 0 additions & 185 deletions bridge/tests/test_livekit_bridge.cpp

This file was deleted.

22 changes: 22 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Commands:
release Configure + build Release version (build-release/)
release-examples Configure + build Release version with examples
release-tests Configure + build Release version with tests
build-all Configure + build all of the above (debug/release + examples + tests)
clean Clean both Debug and Release build directories
clean-all Full clean (build dirs + Rust targets)
help Show this help message
Expand All @@ -60,6 +61,7 @@ Examples:
./build.sh debug
./build.sh debug-tests
./build.sh release-tests
./build.sh build-all
./build.sh clean
./build.sh clean-all
EOF
Expand Down Expand Up @@ -401,6 +403,26 @@ case "${cmd}" in
fi
fi
;;
build-all)
echo "==> Build-all: debug, debug-examples, debug-tests, release, release-examples, release-tests"
BUILD_TYPE="Debug"
BUILD_DIR="${PROJECT_ROOT}/build-debug"
PRESET="${OS_TYPE}-debug"
configure && build
PRESET="${OS_TYPE}-debug-examples"
configure && build
PRESET="${OS_TYPE}-debug-tests"
configure && build
BUILD_TYPE="Release"
BUILD_DIR="${PROJECT_ROOT}/build-release"
PRESET="${OS_TYPE}-release"
configure && build
PRESET="${OS_TYPE}-release-examples"
configure && build
PRESET="${OS_TYPE}-release-tests"
configure && build
echo "==> Build-all complete."
;;
clean)
clean
;;
Expand Down
3 changes: 3 additions & 0 deletions cmake/LiveKitConfig.cmake.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(spdlog)

include("${CMAKE_CURRENT_LIST_DIR}/LiveKitTargets.cmake")

1 change: 0 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ WORKDIR /client-sdk-cpp
RUN mkdir -p /client-sdk-cpp
COPY src /client-sdk-cpp/src
COPY include /client-sdk-cpp/include
COPY bridge /client-sdk-cpp/bridge
COPY build.sh /client-sdk-cpp/build.sh
COPY CMakePresets.json /client-sdk-cpp/CMakePresets.json
COPY build.cmd /client-sdk-cpp/build.cmd
Expand Down
Loading
Loading