Skip to content

Commit ddcee86

Browse files
Try latest build
1 parent fc289a1 commit ddcee86

2 files changed

Lines changed: 13 additions & 373 deletions

File tree

CMakeLists.txt

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,41 +21,19 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
2121
# Make "include(LiveKitSDK)" search in ./cmake
2222
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
2323

24-
set(LIVEKIT_SDK_VERSION "" CACHE STRING
25-
"LiveKit C++ SDK release version (e.g. 0.3.4 or latest). Empty when LIVEKIT_SDK_COMMIT is used.")
26-
# Temporary pin: tracks an unreleased commit on `livekit/client-sdk-cpp@main`
27-
# that contains the unified-method-style guide changes (PR #127). Switch back
28-
# to LIVEKIT_SDK_VERSION once a tagged release ships those changes.
29-
set(LIVEKIT_SDK_COMMIT "f7a8df1b72207d0a81390e64e73f4eb5a4811c56" CACHE STRING
30-
"LiveKit C++ SDK commit hash on main (uses Builds workflow artifacts; ~7d retention).")
24+
set(LIVEKIT_SDK_VERSION "latest" CACHE STRING "LiveKit C++ SDK version (e.g. 0.2.0 or latest)")
3125
set(LIVEKIT_LOCAL_SDK_DIR "" CACHE PATH "Path to a local LiveKit SDK install prefix (skips download)")
3226

3327
if(LIVEKIT_LOCAL_SDK_DIR)
3428
message(STATUS "Using local LiveKit SDK: ${LIVEKIT_LOCAL_SDK_DIR}")
3529
list(PREPEND CMAKE_PREFIX_PATH "${LIVEKIT_LOCAL_SDK_DIR}")
3630
else()
3731
include(LiveKitSDK)
38-
if(LIVEKIT_SDK_COMMIT AND LIVEKIT_SDK_VERSION)
39-
message(FATAL_ERROR
40-
"Set either LIVEKIT_SDK_COMMIT or LIVEKIT_SDK_VERSION, not both.\n"
41-
"Got LIVEKIT_SDK_COMMIT='${LIVEKIT_SDK_COMMIT}' and LIVEKIT_SDK_VERSION='${LIVEKIT_SDK_VERSION}'.")
42-
endif()
43-
if(LIVEKIT_SDK_COMMIT)
44-
livekit_sdk_setup(
45-
COMMIT "${LIVEKIT_SDK_COMMIT}"
46-
SDK_DIR "${CMAKE_BINARY_DIR}/_deps/livekit-sdk"
47-
GITHUB_TOKEN "$ENV{GITHUB_TOKEN}"
48-
)
49-
else()
50-
if(NOT LIVEKIT_SDK_VERSION)
51-
set(LIVEKIT_SDK_VERSION "latest")
52-
endif()
53-
livekit_sdk_setup(
54-
VERSION "${LIVEKIT_SDK_VERSION}"
55-
SDK_DIR "${CMAKE_BINARY_DIR}/_deps/livekit-sdk"
56-
GITHUB_TOKEN "$ENV{GITHUB_TOKEN}"
57-
)
58-
endif()
32+
livekit_sdk_setup(
33+
VERSION "${LIVEKIT_SDK_VERSION}"
34+
SDK_DIR "${CMAKE_BINARY_DIR}/_deps/livekit-sdk"
35+
GITHUB_TOKEN "$ENV{GITHUB_TOKEN}"
36+
)
5937
endif()
6038
find_package(LiveKit CONFIG REQUIRED)
6139

0 commit comments

Comments
 (0)