properly include ABSL_PROPOGATE_CXX_STD

Author: stephen-derosa

CMakeLists.txt

@@ -114,13 +114,26 @@ if(TARGET protobuf::libprotobuf)
 else()
   message(FATAL_ERROR "No protobuf library target found (expected protobuf::libprotobuf)")
 endif()
+set(LIVEKIT_THIRD_PARTY_INCLUDE_DIRS ${Protobuf_INCLUDE_DIRS})
+if(TARGET absl::base)
+  livekit_get_interface_includes(absl::base _absl_inc)
+  if(_absl_inc)
+    list(APPEND LIVEKIT_THIRD_PARTY_INCLUDE_DIRS ${_absl_inc})
+  endif()
+endif()
+if(TARGET spdlog::spdlog)
+  livekit_get_interface_includes(spdlog::spdlog _spdlog_inc)
+  if(_spdlog_inc)
+    list(APPEND LIVEKIT_THIRD_PARTY_INCLUDE_DIRS ${_spdlog_inc})
+  endif()
+endif()
 target_include_directories(livekit_proto SYSTEM PRIVATE
   "${PROTO_BINARY_DIR}"
   ${Protobuf_INCLUDE_DIRS}
 )
 target_link_libraries(livekit_proto PRIVATE ${LIVEKIT_PROTOBUF_TARGET})
 if(TARGET absl::base)
-  get_target_property(_absl_inc absl::base INTERFACE_INCLUDE_DIRECTORIES)
+  livekit_get_interface_includes(absl::base _absl_inc)
   if(_absl_inc)
     target_include_directories(livekit_proto SYSTEM PRIVATE ${_absl_inc})
   endif()
@@ -436,8 +449,9 @@ target_include_directories(livekit
 )
 
 target_include_directories(livekit SYSTEM PRIVATE
-    ${RUST_ROOT}/livekit-ffi/include
-    ${PROTO_BINARY_DIR}
+  ${RUST_ROOT}/livekit-ffi/include
+  ${PROTO_BINARY_DIR}
+  ${LIVEKIT_THIRD_PARTY_INCLUDE_DIRS}
 )
 
 target_link_libraries(livekit

cmake/protobuf.cmake

@@ -131,6 +131,7 @@ set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 # Disable installs/exports in subprojects (avoids export-set errors)
 set(protobuf_INSTALL OFF CACHE BOOL "" FORCE)
 set(ABSL_ENABLE_INSTALL OFF CACHE BOOL "" FORCE)
+set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "" FORCE)
 set(utf8_range_ENABLE_INSTALL OFF CACHE BOOL "" FORCE)
 
 # Force hidden visibility on every target created by the FetchContent
@@ -159,10 +160,10 @@ if(MSVC)
 endif()
 
 # Make abseil available first so protobuf can find absl:: targets.
-FetchContent_MakeAvailable(livekit_abseil)
+livekit_fetchcontent_makeavailable(livekit_abseil)
 livekit_collect_targets_in_directory(_livekit_abseil_targets "${livekit_abseil_BINARY_DIR}")
 foreach(_livekit_abseil_target IN LISTS _livekit_abseil_targets)
-  livekit_treat_as_external(${_livekit_abseil_target})
+  livekit_disable_warnings(${_livekit_abseil_target})
 endforeach()
 
 # Workaround for some abseil flags on Apple Silicon.
@@ -190,10 +191,10 @@ if(NOT TARGET absl::base)
 endif()
 
 # Now make protobuf available.
-FetchContent_MakeAvailable(livekit_protobuf)
+livekit_fetchcontent_makeavailable(livekit_protobuf)
 livekit_collect_targets_in_directory(_livekit_protobuf_targets "${livekit_protobuf_BINARY_DIR}")
 foreach(_livekit_protobuf_target IN LISTS _livekit_protobuf_targets)
-  livekit_treat_as_external(${_livekit_protobuf_target})
+  livekit_disable_warnings(${_livekit_protobuf_target})
 endforeach()
 
 # Protobuf targets: modern protobuf exports protobuf::protoc etc.
@@ -216,8 +217,7 @@ endif()
 
 # Include dirs: prefer target usage; keep this var for your existing CMakeLists.
 if(TARGET protobuf::libprotobuf)
-  livekit_treat_as_external(protobuf::libprotobuf)
-  get_target_property(_pb_includes protobuf::libprotobuf INTERFACE_INCLUDE_DIRECTORIES)
+  livekit_get_interface_includes(protobuf::libprotobuf _pb_includes)
 endif()
 if(NOT _pb_includes)
   set(_pb_includes "${livekit_protobuf_SOURCE_DIR}/src")

cmake/spdlog.cmake

@@ -83,14 +83,11 @@ set(SPDLOG_BUILD_EXAMPLE OFF CACHE BOOL "" FORCE)
 set(SPDLOG_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 set(SPDLOG_INSTALL OFF CACHE BOOL "" FORCE)
 
-FetchContent_MakeAvailable(livekit_spdlog)
+livekit_fetchcontent_makeavailable(livekit_spdlog)
 livekit_collect_targets_in_directory(_livekit_spdlog_targets "${livekit_spdlog_BINARY_DIR}")
 foreach(_livekit_spdlog_target IN LISTS _livekit_spdlog_targets)
-  livekit_treat_as_external(${_livekit_spdlog_target})
+  livekit_disable_warnings(${_livekit_spdlog_target})
 endforeach()
-if(TARGET spdlog::spdlog)
-  livekit_treat_as_external(spdlog::spdlog)
-endif()
 
 # spdlog is linked PRIVATE into liblivekit and must not leak its symbols into
 # the SDK's exported ABI.  Force hidden visibility on the spdlog target so its

cmake/warnings.cmake

@@ -65,6 +65,27 @@ function(livekit_mark_system_includes target)
   endif()
 endfunction()
 
+function(livekit_get_interface_includes target out_var)
+  _livekit_resolve_target(${target} _resolved_target)
+  if(NOT _resolved_target)
+    set(${out_var} "" PARENT_SCOPE)
+    return()
+  endif()
+
+  get_target_property(_interface_includes ${_resolved_target} INTERFACE_INCLUDE_DIRECTORIES)
+  if(_interface_includes)
+    set(${out_var} ${_interface_includes} PARENT_SCOPE)
+  else()
+    set(${out_var} "" PARENT_SCOPE)
+  endif()
+endfunction()
+
+function(livekit_fetchcontent_makeavailable)
+  set(CMAKE_WARN_DEPRECATED OFF)
+  set(CMAKE_POLICY_VERSION_MINIMUM 3.10)
+  FetchContent_MakeAvailable(${ARGV})
+endfunction()
+
 function(livekit_collect_targets_in_directory out_var directory)
   get_property(_targets DIRECTORY "${directory}" PROPERTY BUILDSYSTEM_TARGETS)
   get_property(_subdirectories DIRECTORY "${directory}" PROPERTY SUBDIRECTORIES)

src/tests/CMakeLists.txt

@@ -22,25 +22,34 @@ set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
 # Skip GMock, not used currently
 set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
 
-FetchContent_MakeAvailable(googletest)
+livekit_fetchcontent_makeavailable(googletest)
 livekit_collect_targets_in_directory(_livekit_googletest_targets "${googletest_BINARY_DIR}")
 foreach(_livekit_googletest_target IN LISTS _livekit_googletest_targets)
-  livekit_treat_as_external(${_livekit_googletest_target})
+  livekit_disable_warnings(${_livekit_googletest_target})
 endforeach()
-if(TARGET GTest::gtest_main)
-  livekit_treat_as_external(GTest::gtest_main)
-endif()
 
 set(LIVEKIT_TEST_THIRD_PARTY_INCLUDE_DIRS
   ${LIVEKIT_BINARY_DIR}/generated
   ${Protobuf_INCLUDE_DIRS}
 )
 if(TARGET absl::base)
-  get_target_property(_livekit_test_absl_inc absl::base INTERFACE_INCLUDE_DIRECTORIES)
+  livekit_get_interface_includes(absl::base _livekit_test_absl_inc)
   if(_livekit_test_absl_inc)
     list(APPEND LIVEKIT_TEST_THIRD_PARTY_INCLUDE_DIRS ${_livekit_test_absl_inc})
   endif()
 endif()
+if(TARGET spdlog::spdlog)
+  livekit_get_interface_includes(spdlog::spdlog _livekit_test_spdlog_inc)
+  if(_livekit_test_spdlog_inc)
+    list(APPEND LIVEKIT_TEST_THIRD_PARTY_INCLUDE_DIRS ${_livekit_test_spdlog_inc})
+  endif()
+endif()
+if(TARGET GTest::gtest_main)
+  livekit_get_interface_includes(GTest::gtest_main _livekit_test_gtest_inc)
+  if(_livekit_test_gtest_inc)
+    list(APPEND LIVEKIT_TEST_THIRD_PARTY_INCLUDE_DIRS ${_livekit_test_gtest_inc})
+  endif()
+endif()
 
 # Enable CTest
 enable_testing()