Fix Mac CMake build after r191433.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Oct 2015 22:33:58 +0000 (22:33 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Oct 2015 22:33:58 +0000 (22:33 +0000)
* PlatformMac.cmake:
Use CMakeLists.txt to generate UserAgentScripts.h and cpp.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191483 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/PlatformMac.cmake

index 006c82e..e3e2ae7 100644 (file)
@@ -1,3 +1,10 @@
+2015-10-22  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Mac CMake build after r191433.
+
+        * PlatformMac.cmake:
+        Use CMakeLists.txt to generate UserAgentScripts.h and cpp.
+
 2015-10-22  Daniel Bates  <dabates@apple.com>
 
         Unreviewed, rolling out r191113.
index eef1b49..7fa6205 100644 (file)
@@ -77,12 +77,9 @@ list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
     ${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 @@ add_custom_command(
 
 list(APPEND WebCore_SOURCES
     ${DERIVED_SOURCES_WEBCORE_DIR}/CharsetData.cpp
-    ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.cpp
 )
 
 list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES