[CMake] Unreviewed build fix after r198736.
authorclopez@igalia.com <clopez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 28 Mar 2016 20:59:56 +0000 (20:59 +0000)
committerclopez@igalia.com <clopez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 28 Mar 2016 20:59:56 +0000 (20:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=155221

Unreviewed.

* CMakeLists.txt: Fix typo, add WebAutomationSession.cpp and declare JavaScriptCore_SCRIPTS_DIR.
* WebProcess/Automation/WebAutomationSessionProxy.h: Add missing include.

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

Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/Automation/WebAutomationSessionProxy.h

index 85dd3d7..9af8da1 100644 (file)
@@ -466,6 +466,8 @@ set(WebKit2_SOURCES
     UIProcess/Authentication/WebCredential.cpp
     UIProcess/Authentication/WebProtectionSpace.cpp
 
+    UIProcess/Automation/WebAutomationSession.cpp
+
     UIProcess/Databases/DatabaseProcessProxy.cpp
 
     UIProcess/Downloads/DownloadProxy.cpp
@@ -750,6 +752,12 @@ set(PluginProcess_LIBRARIES
     WebKit2
 )
 
+if (WIN32 AND INTERNAL_BUILD)
+    set(JavaScriptCore_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore/Scripts")
+else ()
+    set(JavaScriptCore_SCRIPTS_DIR "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/Scripts")
+endif ()
+
 # librt is needed for shm_open on Linux.
 find_library(LIBRT_LIBRARIES NAMES rt)
 mark_as_advanced(LIBRT_LIBRARIES)
@@ -815,7 +823,7 @@ add_custom_command(
     VERBATIM)
 
 list(APPEND WebKit2_HEADERS
-    ${DERIVED_SOURCES_WEBKIT2_DIR}/WebauotmationSessionProxyScriptSource.h
+    ${DERIVED_SOURCES_WEBKIT2_DIR}/WebAutomationSessionProxyScriptSource.h
 )
 
 WEBKIT_FRAMEWORK(WebKit2)
index ba85cf7..dcb9bde 100644 (file)
@@ -1,3 +1,13 @@
+2016-03-28  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [CMake] Unreviewed build fix after r198736.
+        https://bugs.webkit.org/show_bug.cgi?id=155221
+
+        Unreviewed.
+
+        * CMakeLists.txt: Fix typo, add WebAutomationSession.cpp and declare JavaScriptCore_SCRIPTS_DIR.
+        * WebProcess/Automation/WebAutomationSessionProxy.h: Add missing include.
+
 2016-03-28  Alex Christensen  <achristensen@webkit.org>
 
         Use std::exchange for std::functions instead of WTFMove
index 36961f2..15cdfd0 100644 (file)
@@ -28,6 +28,7 @@
 
 #include "Connection.h"
 #include <JavaScriptCore/JSBase.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 class Element;