Diff
Modified: trunk/ChangeLog (111798 => 111799)
--- trunk/ChangeLog 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/ChangeLog 2012-03-23 00:54:09 UTC (rev 111799)
@@ -1,3 +1,9 @@
+2012-03-22 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Unreviewed build fix after r111778.
+
+ * Source/CMakeLists.txt: Build WTF/.
+
2012-03-22 Martin Robinson <[email protected]>
Fixed the GTK+ WTF/_javascript_Core build after r111778.
Modified: trunk/Source/CMakeLists.txt (111798 => 111799)
--- trunk/Source/CMakeLists.txt 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Source/CMakeLists.txt 2012-03-23 00:54:09 UTC (rev 111799)
@@ -1,6 +1,8 @@
# -----------------------------------------------------------------------------
# Add module directories
# -----------------------------------------------------------------------------
+ADD_SUBDIRECTORY(WTF)
+
ADD_SUBDIRECTORY(_javascript_Core)
IF (ENABLE_WEBCORE)
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (111798 => 111799)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2012-03-23 00:54:09 UTC (rev 111799)
@@ -1,6 +1,5 @@
SET(_javascript_Core_INCLUDE_DIRECTORIES
"${CMAKE_BINARY_DIR}"
- "${WTF_DIR}"
"${_javascript_CORE_DIR}"
"${_javascript_CORE_DIR}/API"
"${_javascript_CORE_DIR}/ForwardingHeaders"
@@ -18,7 +17,7 @@
"${_javascript_CORE_DIR}/runtime"
"${_javascript_CORE_DIR}/tools"
"${_javascript_CORE_DIR}/yarr"
- "${_javascript_CORE_DIR}/wtf"
+ "${WTF_DIR}"
"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
"${CMAKE_SOURCE_DIR}/Source"
)
@@ -295,7 +294,6 @@
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
-ADD_SUBDIRECTORY(wtf)
ADD_SUBDIRECTORY(shell)
WEBKIT_WRAP_SOURCELIST(${_javascript_Core_SOURCES})
Modified: trunk/Source/_javascript_Core/ChangeLog (111798 => 111799)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-23 00:54:09 UTC (rev 111799)
@@ -1,3 +1,10 @@
+2012-03-22 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Unreviewed build fix after r111778.
+
+ * CMakeLists.txt: Move ${WTF_DIR} after ${_javascript_CORE_DIR} in
+ the include paths so that the right config.h is used.
+
2012-03-22 Tony Chang <[email protected]>
Unreviewed, fix chromium build after wtf move.
Added: trunk/Source/WTF/CMakeLists.txt (0 => 111799)
--- trunk/Source/WTF/CMakeLists.txt (rev 0)
+++ trunk/Source/WTF/CMakeLists.txt 2012-03-23 00:54:09 UTC (rev 111799)
@@ -0,0 +1 @@
+ADD_SUBDIRECTORY(wtf)
Modified: trunk/Source/WTF/ChangeLog (111798 => 111799)
--- trunk/Source/WTF/ChangeLog 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Source/WTF/ChangeLog 2012-03-23 00:54:09 UTC (rev 111799)
@@ -1,3 +1,11 @@
+2012-03-22 Raphael Kubo da Costa <[email protected]>
+
+ [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 <[email protected]>
Unreviewed, attempt to fix the chromium-win build and another attempt
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (111798 => 111799)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2012-03-23 00:54:09 UTC (rev 111799)
@@ -190,6 +190,7 @@
"${WTF_DIR}/wtf/unicode"
"${WTF_DIR}/wtf/dtoa"
"${THIRDPARTY_DIR}"
+ "${CMAKE_BINARY_DIR}"
)
IF (ENABLE_FAST_MALLOC)
Modified: trunk/Source/WebCore/CMakeLists.txt (111798 => 111799)
--- trunk/Source/WebCore/CMakeLists.txt 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-03-23 00:54:09 UTC (rev 111799)
@@ -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 @@
"${_javascript_CORE_DIR}/parser"
"${_javascript_CORE_DIR}/profiler"
"${_javascript_CORE_DIR}/runtime"
- "${_javascript_CORE_DIR}/wtf"
- "${_javascript_CORE_DIR}/wtf/unicode"
"${_javascript_CORE_DIR}/yarr"
+ "${WTF_DIR}"
+ "${WTF_DIR}/wtf"
+ "${WTF_DIR}/wtf/unicode"
"${DERIVED_SOURCES_WEBCORE_DIR}"
"${CMAKE_SOURCE_DIR}/Source"
"${CMAKE_BINARY_DIR}"
Modified: trunk/Source/WebCore/ChangeLog (111798 => 111799)
--- trunk/Source/WebCore/ChangeLog 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Source/WebCore/ChangeLog 2012-03-23 00:54:09 UTC (rev 111799)
@@ -1,3 +1,10 @@
+2012-03-22 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Unreviewed build fix after r111778.
+
+ * CMakeLists.txt: Replace ${_javascript_CORE_DIR}/wtf includes with
+ ${WTF_DIR}/wtf ones.
+
2012-03-22 Tony Chang <[email protected]>
Unreviewed, fix chromium build after wtf move.
Modified: trunk/Source/WebKit/CMakeLists.txt (111798 => 111799)
--- trunk/Source/WebKit/CMakeLists.txt 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Source/WebKit/CMakeLists.txt 2012-03-23 00:54:09 UTC (rev 111799)
@@ -1,5 +1,4 @@
SET(WebKit_INCLUDE_DIRECTORIES
- "${WTF_DIR}"
"${WEBKIT_DIR}"
"${WEBCORE_DIR}"
"${WEBCORE_DIR}/Modules/webdatabase"
@@ -51,8 +50,9 @@
"${_javascript_CORE_DIR}/parser"
"${_javascript_CORE_DIR}/profiler"
"${_javascript_CORE_DIR}/runtime"
- "${_javascript_CORE_DIR}/wtf"
- "${_javascript_CORE_DIR}/wtf/unicode"
+ "${WTF_DIR}"
+ "${WTF_DIR}/wtf"
+ "${WTF_DIR}/wtf/unicode"
"${DERIVED_SOURCES_WEBCORE_DIR}"
"${CMAKE_BINARY_DIR}"
)
Modified: trunk/Source/WebKit/ChangeLog (111798 => 111799)
--- trunk/Source/WebKit/ChangeLog 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Source/WebKit/ChangeLog 2012-03-23 00:54:09 UTC (rev 111799)
@@ -1,3 +1,10 @@
+2012-03-22 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Unreviewed build fix after r111778.
+
+ * CMakeLists.txt: Replace ${_javascript_CORE_DIR}/wtf includes with
+ ${WTF_DIR}/wtf ones.
+
2012-03-22 Hyowon Kim <[email protected]>
[EFL] Add PageClientEfl to WebCoreSupport.
Modified: trunk/Source/WebKit2/CMakeLists.txt (111798 => 111799)
--- trunk/Source/WebKit2/CMakeLists.txt 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Source/WebKit2/CMakeLists.txt 2012-03-23 00:54:09 UTC (rev 111799)
@@ -85,7 +85,7 @@
"${_javascript_CORE_DIR}/parser"
"${_javascript_CORE_DIR}/profiler"
"${_javascript_CORE_DIR}/runtime"
- "${_javascript_CORE_DIR}/wtf"
+ "${WTF_DIR}/wtf"
"${DERIVED_SOURCES_DIR}"
"${DERIVED_SOURCES_WEBCORE_DIR}"
"${DERIVED_SOURCES_WEBKIT2_DIR}"
Modified: trunk/Source/WebKit2/ChangeLog (111798 => 111799)
--- trunk/Source/WebKit2/ChangeLog 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-23 00:54:09 UTC (rev 111799)
@@ -1,3 +1,10 @@
+2012-03-22 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Unreviewed build fix after r111778.
+
+ * CMakeLists.txt: Replace ${_javascript_CORE_DIR}/wtf includes with
+ ${WTF_DIR}/wtf ones.
+
2012-03-22 Csaba Osztrogonác <[email protected]>
Actually move WTF files to their new home
Modified: trunk/Tools/ChangeLog (111798 => 111799)
--- trunk/Tools/ChangeLog 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Tools/ChangeLog 2012-03-23 00:54:09 UTC (rev 111799)
@@ -1,3 +1,16 @@
+2012-03-22 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Unreviewed build fix after r111778.
+
+ * DumpRenderTree/efl/CMakeLists.txt: Replace
+ ${_javascript_CORE_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 ${_javascript_CORE_DIR}/wtf
+ with ${WTF_DIR}/wtf in the include paths.
+
2012-03-22 Filip Pizlo <[email protected]>
Tools/Scripts/build-jsc doesn't work after WTF move
Modified: trunk/Tools/DumpRenderTree/efl/CMakeLists.txt (111798 => 111799)
--- trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2012-03-23 00:54:09 UTC (rev 111799)
@@ -41,7 +41,6 @@
)
SET(DumpRenderTree_INCLUDE_DIRECTORIES
- ${WTF_DIR}
"${WEBKIT_DIR}/efl/ewk"
${WEBKIT_DIR}/efl
${WEBCORE_DIR}
@@ -80,12 +79,13 @@
${_javascript_CORE_DIR}/llint
${_javascript_CORE_DIR}/runtime
${_javascript_CORE_DIR}/ForwardingHeaders
- ${_javascript_CORE_DIR}/wtf
- ${_javascript_CORE_DIR}/wtf/gobject
- ${_javascript_CORE_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}
Modified: trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp (111798 => 111799)
--- trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp 2012-03-23 00:54:09 UTC (rev 111799)
@@ -49,10 +49,10 @@
#include <_javascript_Core/JSRetainPtr.h>
#include <_javascript_Core/JSStringRef.h>
#include <_javascript_Core/OpaqueJSString.h>
-#include <_javascript_Core/wtf/text/WTFString.h>
#include <KURL.h>
#include <editing/FindOptions.h>
#include <stdio.h>
+#include <wtf/text/WTFString.h>
LayoutTestController::~LayoutTestController()
{
Modified: trunk/Tools/DumpRenderTree/efl/WorkQueueItemEfl.cpp (111798 => 111799)
--- trunk/Tools/DumpRenderTree/efl/WorkQueueItemEfl.cpp 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Tools/DumpRenderTree/efl/WorkQueueItemEfl.cpp 2012-03-23 00:54:09 UTC (rev 111799)
@@ -29,7 +29,7 @@
#include <_javascript_Core/JSStringRef.h>
#include <_javascript_Core/OpaqueJSString.h>
#include <_javascript_Core/runtime/UString.h>
-#include <_javascript_Core/wtf/text/CString.h>
+#include <wtf/text/CString.h>
bool LoadItem::invoke() const
{
Modified: trunk/Tools/WinCELauncher/CMakeLists.txt (111798 => 111799)
--- trunk/Tools/WinCELauncher/CMakeLists.txt 2012-03-23 00:51:14 UTC (rev 111798)
+++ trunk/Tools/WinCELauncher/CMakeLists.txt 2012-03-23 00:54:09 UTC (rev 111799)
@@ -6,7 +6,7 @@
"${WEBCORE_DIR}/platform/network"
"${WEBCORE_DIR}/platform/text"
"${_javascript_CORE_DIR}"
- "${_javascript_CORE_DIR}/wtf"
+ "${WTF_DIR}/wtf"
"${DERIVED_SOURCES_DIR}"
"${CMAKE_BINARY_DIR}"
)
