Skip to content

Commit

Permalink
CMake: Get rid of TG_OWT_USE_PROTOBUF
Browse files Browse the repository at this point in the history
It's not clear what this option is for and there's no one to maintain it
  • Loading branch information
ilya-fedin authored and john-preston committed Jul 30, 2024
1 parent c483100 commit e9d103e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 66 deletions.
26 changes: 0 additions & 26 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ if (NOT TG_OWT_PACKAGED_BUILD)
endif()

option(BUILD_SHARED_LIBS "Builds shared libraries instead of static." OFF)
option(TG_OWT_USE_PROTOBUF "Use protobuf to generate additional headers. Useful for packaged build." ${BUILD_SHARED_LIBS})
cmake_dependent_option(TG_OWT_USE_X11 "Use X11 for desktop capture." ON "UNIX; NOT APPLE" OFF)
cmake_dependent_option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture." ON "UNIX; NOT APPLE" OFF)
cmake_dependent_option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire for desktop capture." ${not_packaged_build} TG_OWT_USE_PIPEWIRE OFF)
Expand Down Expand Up @@ -84,12 +83,6 @@ if (APPLE)
include(cmake/libsdkmacos.cmake)
endif()

# Use a separate subdirectory, because it will be exported as an INTERFACE
# for the generated sources and headers.
if (TG_OWT_USE_PROTOBUF)
add_subdirectory(cmake/protobuf)
endif()

add_library(tg_owt)
init_target(tg_owt)

Expand Down Expand Up @@ -153,13 +146,6 @@ if (is_x86 OR is_x64)
)
endif()

if (TG_OWT_USE_PROTOBUF)
target_link_libraries(tg_owt
PRIVATE
tg_owt::proto
)
endif()

if (APPLE)
target_link_libraries(tg_owt PUBLIC tg_owt::libsdkmacos)
endif()
Expand Down Expand Up @@ -1985,8 +1971,6 @@ PRIVATE
logging/rtc_event_log/encoder/optional_blob_encoding.cc
logging/rtc_event_log/encoder/optional_blob_encoding.h
logging/rtc_event_log/encoder/rtc_event_log_encoder_common.cc
logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc
logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc
logging/rtc_event_log/encoder/rtc_event_log_encoder_v3.cc
logging/rtc_event_log/encoder/rtc_event_log_encoder_v3.h
logging/rtc_event_log/encoder/var_int.cc
Expand Down Expand Up @@ -2406,13 +2390,6 @@ if (is_x86 OR is_x64)
)
endif()

if (NOT TG_OWT_USE_PROTOBUF)
remove_target_sources(tg_owt ${webrtc_loc}
logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc
logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc
)
endif()

if (NOT TG_OWT_USE_X11)
remove_target_sources(tg_owt ${webrtc_loc}
# src/modules/desktop_capture/BUILD.gn (rtc_use_x11_extensions)
Expand Down Expand Up @@ -2643,9 +2620,6 @@ if (is_x86 OR is_x64)
tg_owt_sse2
)
endif()
if (TG_OWT_USE_PROTOBUF)
list(APPEND export_targets proto)
endif()
if (APPLE)
list(APPEND export_targets libsdkmacos)
endif()
Expand Down
40 changes: 0 additions & 40 deletions cmake/protobuf/CMakeLists.txt

This file was deleted.

0 comments on commit e9d103e

Please sign in to comment.