Title: [208948] trunk/Source/WebCore
- Revision
- 208948
- Author
- commit-qu...@webkit.org
- Date
- 2016-11-21 08:25:49 -0800 (Mon, 21 Nov 2016)
Log Message
[cmake][OpenWebRTC] Move SDPProcessorScriptResource rules to common WebCore
https://bugs.webkit.org/show_bug.cgi?id=164937
Patch by Olivier Blin <olivier.b...@softathome.com> on 2016-11-21
Reviewed by Youenn Fablet.
SDPProcessorScriptResource has been moved in common mediastream directory (bug 163940).
Since it is not specific to the GTK port, the matching cmake rules should be
moved out from PlatformGTK.cmake to the main WebCore CMakeLists.txt.
This is needed to build OpenWebRTC support in other ports, WPE in my case,
probably Mac, EFL and Qt as well.
This also fixes the path in SDP scripts dependencies, the old openwebrtc subdir
was still being used.
No new tests, build fix only
* CMakeLists.txt:
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (208947 => 208948)
--- trunk/Source/WebCore/CMakeLists.txt 2016-11-21 13:12:26 UTC (rev 208947)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-11-21 16:25:49 UTC (rev 208948)
@@ -2346,6 +2346,7 @@
platform/mediastream/RealtimeMediaSource.cpp
platform/mediastream/RealtimeMediaSourceCenter.cpp
platform/mediastream/RealtimeMediaSourceSettings.cpp
+ platform/mediastream/SDPProcessorScriptResource.cpp
platform/mock/DeviceMotionClientMock.cpp
platform/mock/DeviceOrientationClientMock.cpp
@@ -3668,11 +3669,13 @@
)
endif ()
-if (WebCore_SDP_PROCESSOR_SCRIPTS)
+if (ENABLE_WEB_RTC)
# Necessary variables:
# WebCore_SDP_PROCESSOR_SCRIPTS containing the _javascript_ sources list
# WebCore_SDP_PROCESSOR_SCRIPTS_DEPENDENCIES containing the source file that will load the scripts to add the proper
# dependency and having them built at the right moment
+ set(WebCore_SDP_PROCESSOR_SCRIPTS ${WEBCORE_DIR}/Modules/mediastream/sdp.js)
+ set(WebCore_SDP_PROCESSOR_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/mediastream/SDPProcessorScriptResource.cpp)
MAKE_JS_FILE_ARRAYS(
${DERIVED_SOURCES_WEBCORE_DIR}/SDPProcessorScriptsData.cpp
Modified: trunk/Source/WebCore/ChangeLog (208947 => 208948)
--- trunk/Source/WebCore/ChangeLog 2016-11-21 13:12:26 UTC (rev 208947)
+++ trunk/Source/WebCore/ChangeLog 2016-11-21 16:25:49 UTC (rev 208948)
@@ -1,3 +1,26 @@
+2016-11-21 Olivier Blin <olivier.b...@softathome.com>
+
+ [cmake][OpenWebRTC] Move SDPProcessorScriptResource rules to common WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=164937
+
+ Reviewed by Youenn Fablet.
+
+ SDPProcessorScriptResource has been moved in common mediastream directory (bug 163940).
+
+ Since it is not specific to the GTK port, the matching cmake rules should be
+ moved out from PlatformGTK.cmake to the main WebCore CMakeLists.txt.
+
+ This is needed to build OpenWebRTC support in other ports, WPE in my case,
+ probably Mac, EFL and Qt as well.
+
+ This also fixes the path in SDP scripts dependencies, the old openwebrtc subdir
+ was still being used.
+
+ No new tests, build fix only
+
+ * CMakeLists.txt:
+ * PlatformGTK.cmake:
+
2016-11-21 Carlos Garcia Campos <cgar...@igalia.com>
Add URL::hostAndPort()
Modified: trunk/Source/WebCore/PlatformGTK.cmake (208947 => 208948)
--- trunk/Source/WebCore/PlatformGTK.cmake 2016-11-21 13:12:26 UTC (rev 208947)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-11-21 16:25:49 UTC (rev 208948)
@@ -166,8 +166,6 @@
platform/image-decoders/cairo/ImageBackingStoreCairo.cpp
- platform/mediastream/SDPProcessorScriptResource.cpp
-
platform/network/soup/AuthenticationChallengeSoup.cpp
platform/network/soup/CertificateInfo.cpp
platform/network/soup/CookieJarSoup.cpp
@@ -260,9 +258,6 @@
set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/gtk/RenderThemeGtk.cpp)
-set(WebCore_SDP_PROCESSOR_SCRIPTS ${WEBCORE_DIR}/Modules/mediastream/sdp.js)
-set(WebCore_SDP_PROCESSOR_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp)
-
list(APPEND WebCore_LIBRARIES
${ATK_LIBRARIES}
${CAIRO_LIBRARIES}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
