[CMake] Unreviewed build fix after r111778.
authorkubo@profusion.mobi <kubo@profusion.mobi@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Mar 2012 00:54:09 +0000 (00:54 +0000)
committerkubo@profusion.mobi <kubo@profusion.mobi@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Mar 2012 00:54:09 +0000 (00:54 +0000)
.:

* Source/CMakeLists.txt: Build WTF/.

Source/JavaScriptCore:

* CMakeLists.txt: Move ${WTF_DIR} after ${JAVASCRIPTCORE_DIR} in
the include paths so that the right config.h is used.

Source/WebCore:

* CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf includes with
${WTF_DIR}/wtf ones.

Source/WebKit:

* CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf includes with
${WTF_DIR}/wtf ones.

Source/WebKit2:

* CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf includes with
${WTF_DIR}/wtf ones.

Source/WTF:

* CMakeLists.txt: Added.
* wtf/CMakeLists.txt: Add ${CMAKE_BINARY_DIR} to the include paths
for cmakeconfig.h to be found.

Tools:

* DumpRenderTree/efl/CMakeLists.txt: Replace
${JAVASCRIPTCORE_DIR}/wtf with ${WTF_DIR}/wtf in the include
paths.
* DumpRenderTree/efl/LayoutTestControllerEfl.cpp: Use the right
wtf include.
* DumpRenderTree/efl/WorkQueueItemEfl.cpp: Ditto.
* WinCELauncher/CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf
with ${WTF_DIR}/wtf in the include paths.

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

18 files changed:
ChangeLog
Source/CMakeLists.txt
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/WTF/CMakeLists.txt [new file with mode: 0644]
Source/WTF/ChangeLog
Source/WTF/wtf/CMakeLists.txt
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebKit/CMakeLists.txt
Source/WebKit/ChangeLog
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Tools/ChangeLog
Tools/DumpRenderTree/efl/CMakeLists.txt
Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp
Tools/DumpRenderTree/efl/WorkQueueItemEfl.cpp
Tools/WinCELauncher/CMakeLists.txt

index b79bfd2..443eee8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
+
+        [CMake] Unreviewed build fix after r111778.
+
+        * Source/CMakeLists.txt: Build WTF/.
+
 2012-03-22  Martin Robinson  <mrobinson@igalia.com>
 
         Fixed the GTK+ WTF/JavaScriptCore build after r111778.
index 7aac135..2ddb393 100644 (file)
@@ -1,6 +1,8 @@
 # -----------------------------------------------------------------------------
 # Add module directories
 # -----------------------------------------------------------------------------
+ADD_SUBDIRECTORY(WTF)
+
 ADD_SUBDIRECTORY(JavaScriptCore)
 
 IF (ENABLE_WEBCORE)
index dbe42c8..6e66847 100644 (file)
@@ -1,6 +1,5 @@
 SET(JavaScriptCore_INCLUDE_DIRECTORIES
     "${CMAKE_BINARY_DIR}"
-    "${WTF_DIR}"
     "${JAVASCRIPTCORE_DIR}"
     "${JAVASCRIPTCORE_DIR}/API"
     "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
@@ -18,7 +17,7 @@ SET(JavaScriptCore_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}/runtime"
     "${JAVASCRIPTCORE_DIR}/tools"
     "${JAVASCRIPTCORE_DIR}/yarr"
-    "${JAVASCRIPTCORE_DIR}/wtf"
+    "${WTF_DIR}"
     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
     "${CMAKE_SOURCE_DIR}/Source"
 )
@@ -295,7 +294,6 @@ ENDIF ()
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 
-ADD_SUBDIRECTORY(wtf)
 ADD_SUBDIRECTORY(shell)
 
 WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
index bcd5e8c..62f15b4 100644 (file)
@@ -1,3 +1,10 @@
+2012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
+
+        [CMake] Unreviewed build fix after r111778.
+
+        * CMakeLists.txt: Move ${WTF_DIR} after ${JAVASCRIPTCORE_DIR} in
+        the include paths so that the right config.h is used.
+
 2012-03-22  Tony Chang  <tony@chromium.org>
 
         Unreviewed, fix chromium build after wtf move.
diff --git a/Source/WTF/CMakeLists.txt b/Source/WTF/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c383a2b
--- /dev/null
@@ -0,0 +1 @@
+ADD_SUBDIRECTORY(wtf)
index 69f22dd..77817cd 100644 (file)
@@ -1,3 +1,11 @@
+2012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
+
+        [CMake] Unreviewed build fix after r111778.
+
+        * CMakeLists.txt: Added.
+        * wtf/CMakeLists.txt: Add ${CMAKE_BINARY_DIR} to the include paths
+        for cmakeconfig.h to be found.
+
 2012-03-22  Tony Chang  <tony@chromium.org>
 
         Unreviewed, attempt to fix the chromium-win build and another attempt
index fbb65b1..8b19358 100644 (file)
@@ -190,6 +190,7 @@ SET(WTF_INCLUDE_DIRECTORIES
     "${WTF_DIR}/wtf/unicode"
     "${WTF_DIR}/wtf/dtoa"
     "${THIRDPARTY_DIR}"
+    "${CMAKE_BINARY_DIR}"
 )
 
 IF (ENABLE_FAST_MALLOC)
index 38ca544..628f8fd 100644 (file)
@@ -1,6 +1,5 @@
 SET(WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}"
-    "${WTF_DIR}"
     "${WEBCORE_DIR}/Modules/filesystem"
     "${WEBCORE_DIR}/Modules/geolocation"
     "${WEBCORE_DIR}/Modules/indexeddb"
@@ -85,9 +84,10 @@ SET(WebCore_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}/parser"
     "${JAVASCRIPTCORE_DIR}/profiler"
     "${JAVASCRIPTCORE_DIR}/runtime"
-    "${JAVASCRIPTCORE_DIR}/wtf"
-    "${JAVASCRIPTCORE_DIR}/wtf/unicode"
     "${JAVASCRIPTCORE_DIR}/yarr"
+    "${WTF_DIR}"
+    "${WTF_DIR}/wtf"
+    "${WTF_DIR}/wtf/unicode"
     "${DERIVED_SOURCES_WEBCORE_DIR}"
     "${CMAKE_SOURCE_DIR}/Source"
     "${CMAKE_BINARY_DIR}"
index 35551ac..57f20ee 100644 (file)
@@ -1,3 +1,10 @@
+2012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
+
+        [CMake] Unreviewed build fix after r111778.
+
+        * CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf includes with
+        ${WTF_DIR}/wtf ones.
+
 2012-03-22  Tony Chang  <tony@chromium.org>
 
         Unreviewed, fix chromium build after wtf move.
index f13ec26..44ae46e 100644 (file)
@@ -1,5 +1,4 @@
 SET(WebKit_INCLUDE_DIRECTORIES
-    "${WTF_DIR}"
     "${WEBKIT_DIR}"
     "${WEBCORE_DIR}"
     "${WEBCORE_DIR}/Modules/webdatabase"
@@ -51,8 +50,9 @@ SET(WebKit_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}/parser"
     "${JAVASCRIPTCORE_DIR}/profiler"
     "${JAVASCRIPTCORE_DIR}/runtime"
-    "${JAVASCRIPTCORE_DIR}/wtf"
-    "${JAVASCRIPTCORE_DIR}/wtf/unicode"
+    "${WTF_DIR}"
+    "${WTF_DIR}/wtf"
+    "${WTF_DIR}/wtf/unicode"
     "${DERIVED_SOURCES_WEBCORE_DIR}"
     "${CMAKE_BINARY_DIR}"
 )
index 61da4a3..b731bd9 100644 (file)
@@ -1,3 +1,10 @@
+2012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
+
+        [CMake] Unreviewed build fix after r111778.
+
+        * CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf includes with
+        ${WTF_DIR}/wtf ones.
+
 2012-03-22  Hyowon Kim  <hw1008.kim@samsung.com>
 
         [EFL] Add PageClientEfl to WebCoreSupport.
index e53b958..b2fde9d 100644 (file)
@@ -85,7 +85,7 @@ SET(WebKit2_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}/parser"
     "${JAVASCRIPTCORE_DIR}/profiler"
     "${JAVASCRIPTCORE_DIR}/runtime"
-    "${JAVASCRIPTCORE_DIR}/wtf"
+    "${WTF_DIR}/wtf"
     "${DERIVED_SOURCES_DIR}"
     "${DERIVED_SOURCES_WEBCORE_DIR}"
     "${DERIVED_SOURCES_WEBKIT2_DIR}"
index bf9b0cc..d202016 100644 (file)
@@ -1,3 +1,10 @@
+2012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
+
+        [CMake] Unreviewed build fix after r111778.
+
+        * CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf includes with
+        ${WTF_DIR}/wtf ones.
+
 2012-03-22  Csaba Osztrogon√°c  <ossy@webkit.org>
 
         Actually move WTF files to their new home
index 82165a8..dbaba1d 100644 (file)
@@ -1,3 +1,16 @@
+2012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
+
+        [CMake] Unreviewed build fix after r111778.
+
+        * DumpRenderTree/efl/CMakeLists.txt: Replace
+        ${JAVASCRIPTCORE_DIR}/wtf with ${WTF_DIR}/wtf in the include
+        paths.
+        * DumpRenderTree/efl/LayoutTestControllerEfl.cpp: Use the right
+        wtf include.
+        * DumpRenderTree/efl/WorkQueueItemEfl.cpp: Ditto.
+        * WinCELauncher/CMakeLists.txt: Replace ${JAVASCRIPTCORE_DIR}/wtf
+        with ${WTF_DIR}/wtf in the include paths.
+
 2012-03-22  Filip Pizlo  <fpizlo@apple.com>
 
         Tools/Scripts/build-jsc doesn't work after WTF move
index 78f93fb..cc8dfaf 100644 (file)
@@ -41,7 +41,6 @@ SET(DumpRenderTree_LIBRARIES
 )
 
 SET(DumpRenderTree_INCLUDE_DIRECTORIES
-    ${WTF_DIR}
     "${WEBKIT_DIR}/efl/ewk"
     ${WEBKIT_DIR}/efl
     ${WEBCORE_DIR}
@@ -80,12 +79,13 @@ SET(DumpRenderTree_INCLUDE_DIRECTORIES
     ${JAVASCRIPTCORE_DIR}/llint
     ${JAVASCRIPTCORE_DIR}/runtime
     ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
-    ${JAVASCRIPTCORE_DIR}/wtf
-    ${JAVASCRIPTCORE_DIR}/wtf/gobject
-    ${JAVASCRIPTCORE_DIR}/wtf/efl
     ${TOOLS_DIR}/DumpRenderTree
     ${TOOLS_DIR}/DumpRenderTree/cairo
     ${TOOLS_DIR}/DumpRenderTree/efl
+    ${WTF_DIR}
+    ${WTF_DIR}/wtf
+    ${WTF_DIR}/wtf/efl
+    ${WTF_DIR}/wtf/gobject
     ${CMAKE_SOURCE_DIR}/Source
     ${CMAKE_BINARY_DIR}
     ${DERIVED_SOURCES_WEBCORE_DIR}
index e99d61b..e5cdd78 100644 (file)
 #include <JavaScriptCore/JSRetainPtr.h>
 #include <JavaScriptCore/JSStringRef.h>
 #include <JavaScriptCore/OpaqueJSString.h>
-#include <JavaScriptCore/wtf/text/WTFString.h>
 #include <KURL.h>
 #include <editing/FindOptions.h>
 #include <stdio.h>
+#include <wtf/text/WTFString.h>
 
 LayoutTestController::~LayoutTestController()
 {
index 356a655..61ff7ba 100644 (file)
@@ -29,7 +29,7 @@
 #include <JavaScriptCore/JSStringRef.h>
 #include <JavaScriptCore/OpaqueJSString.h>
 #include <JavaScriptCore/runtime/UString.h>
-#include <JavaScriptCore/wtf/text/CString.h>
+#include <wtf/text/CString.h>
 
 bool LoadItem::invoke() const
 {
index 5a64588..3fd6915 100644 (file)
@@ -6,7 +6,7 @@ SET(WinCELauncher_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/network"
     "${WEBCORE_DIR}/platform/text"
     "${JAVASCRIPTCORE_DIR}"
-    "${JAVASCRIPTCORE_DIR}/wtf"
+    "${WTF_DIR}/wtf"
     "${DERIVED_SOURCES_DIR}"
     "${CMAKE_BINARY_DIR}"
 )