Title: [191483] trunk/Source/WebCore
- Revision
- 191483
- Author
- [email protected]
- Date
- 2015-10-22 15:33:58 -0700 (Thu, 22 Oct 2015)
Log Message
Fix Mac CMake build after r191433.
* PlatformMac.cmake:
Use CMakeLists.txt to generate UserAgentScripts.h and cpp.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (191482 => 191483)
--- trunk/Source/WebCore/ChangeLog 2015-10-22 22:27:19 UTC (rev 191482)
+++ trunk/Source/WebCore/ChangeLog 2015-10-22 22:33:58 UTC (rev 191483)
@@ -1,3 +1,10 @@
+2015-10-22 Alex Christensen <[email protected]>
+
+ Fix Mac CMake build after r191433.
+
+ * PlatformMac.cmake:
+ Use CMakeLists.txt to generate UserAgentScripts.h and cpp.
+
2015-10-22 Daniel Bates <[email protected]>
Unreviewed, rolling out r191113.
Modified: trunk/Source/WebCore/PlatformMac.cmake (191482 => 191483)
--- trunk/Source/WebCore/PlatformMac.cmake 2015-10-22 22:27:19 UTC (rev 191482)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-10-22 22:33:58 UTC (rev 191483)
@@ -77,12 +77,9 @@
${WEBCORE_DIR}/Modules/plugins/QuickTimePluginReplacement.css
)
-add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.cpp
- MAIN_DEPENDENCY ${WEBCORE_DIR}/Modules/plugins/QuickTimePluginReplacement.js
- DEPENDS Scripts/make-js-file-arrays.py
- COMMAND PYTHONPATH=${WebCore_INSPECTOR_SCRIPTS_DIR} ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/Scripts/make-js-file-arrays.py ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.cpp ${WEBCORE_DIR}/Modules/plugins/QuickTimePluginReplacement.js
- VERBATIM)
+set(WebCore_USER_AGENT_SCRIPTS
+ ${WEBCORE_DIR}/Modules/plugins/QuickTimePluginReplacement.js
+)
#FIXME: Use ios-encodings.txt once we get CMake working for iOS.
add_custom_command(
@@ -95,7 +92,6 @@
list(APPEND WebCore_SOURCES
${DERIVED_SOURCES_WEBCORE_DIR}/CharsetData.cpp
- ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.cpp
)
list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes