Fix the build when using libwebrtc

Unreviewed build fixes. * Source/ThirdParty/libwebrtc/CMakeLists.txt: Set the CXX_STANDARD property on the webrtc target to use C++17, as required by some part of libabseil. * Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc: Add missing include for <optional>. Canonical link: https://commits.webkit.org/266719.356@webkitglib/2.42
WebKit · Mar 14, 2024 · 53c8c77 · 53c8c77
1 parent d121f66
commit 53c8c77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt
@@ -2034,12 +2034,12 @@ endif ()
 add_library(webrtc STATIC ${webrtc_SOURCES})
 
 target_compile_options(webrtc PRIVATE
-    "$<$<COMPILE_LANGUAGE:CXX>:-std=gnu++11>"
     "-UHAVE_CONFIG_H"
     "-DWEBRTC_WEBKIT_BUILD=1"
     "-w"
 )
 
+set_target_properties(webrtc PROPERTIES CXX_STANDARD 17)
 set_target_properties(webrtc PROPERTIES CXX_VISIBILITY_PRESET hidden)
 set_target_properties(webrtc PROPERTIES C_VISIBILITY_PRESET hidden)
 

diff --git a/Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc b/Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
@@ -12,6 +12,7 @@
 
 #include <algorithm>
 #include <utility>
+#include <optional>
 
 #include "absl/algorithm/container.h"
 #include "absl/memory/memory.h"