Diff
Modified: trunk/CMakeLists.txt (188435 => 188436)
--- trunk/CMakeLists.txt 2015-08-14 04:41:26 UTC (rev 188435)
+++ trunk/CMakeLists.txt 2015-08-14 04:53:20 UTC (rev 188436)
@@ -1,6 +1,28 @@
cmake_minimum_required(VERSION 2.8.12)
project(WebKit)
+# -----------------------------------------------------------------------------
+# Default library type
+# -----------------------------------------------------------------------------
+set(BMALLOC_DIR "${CMAKE_SOURCE_DIR}/Source/bmalloc")
+set(WTF_DIR "${CMAKE_SOURCE_DIR}/Source/WTF")
+set(_javascript_CORE_DIR "${CMAKE_SOURCE_DIR}/Source/_javascript_Core")
+set(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
+set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
+set(WEBKIT2_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit2")
+set(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/Source/ThirdParty")
+
+set(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
+
+set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
+set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/_javascript_Core")
+set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
+set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
+set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
+set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
+set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
+set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
+
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
if (NOT DEFINED ENABLE_WEBKIT)
Modified: trunk/ChangeLog (188435 => 188436)
--- trunk/ChangeLog 2015-08-14 04:41:26 UTC (rev 188435)
+++ trunk/ChangeLog 2015-08-14 04:53:20 UTC (rev 188436)
@@ -1,3 +1,16 @@
+2015-08-13 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r188428.
+ https://bugs.webkit.org/show_bug.cgi?id=148015
+
+ broke cmake build (Requested by alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "Move some commands from ./CMakeLists.txt to Source/cmake"
+ https://bugs.webkit.org/show_bug.cgi?id=148003
+ http://trac.webkit.org/changeset/188428
+
2015-08-13 Alex Christensen <[email protected]>
Move some commands from ./CMakeLists.txt to Source/cmake
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (188435 => 188436)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2015-08-14 04:41:26 UTC (rev 188435)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2015-08-14 04:53:20 UTC (rev 188436)
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
-include(WebKitCommon)
-
set(_javascript_Core_INCLUDE_DIRECTORIES
"${CMAKE_BINARY_DIR}"
"${_javascript_CORE_DIR}"
Modified: trunk/Source/_javascript_Core/ChangeLog (188435 => 188436)
--- trunk/Source/_javascript_Core/ChangeLog 2015-08-14 04:41:26 UTC (rev 188435)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-08-14 04:53:20 UTC (rev 188436)
@@ -1,5 +1,18 @@
2015-08-13 Commit Queue <[email protected]>
+ Unreviewed, rolling out r188428.
+ https://bugs.webkit.org/show_bug.cgi?id=148015
+
+ broke cmake build (Requested by alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "Move some commands from ./CMakeLists.txt to Source/cmake"
+ https://bugs.webkit.org/show_bug.cgi?id=148003
+ http://trac.webkit.org/changeset/188428
+
+2015-08-13 Commit Queue <[email protected]>
+
Unreviewed, rolling out r188431.
https://bugs.webkit.org/show_bug.cgi?id=148013
Modified: trunk/Source/WTF/CMakeLists.txt (188435 => 188436)
--- trunk/Source/WTF/CMakeLists.txt 2015-08-14 04:41:26 UTC (rev 188435)
+++ trunk/Source/WTF/CMakeLists.txt 2015-08-14 04:53:20 UTC (rev 188436)
@@ -1,4 +1 @@
-cmake_minimum_required(VERSION 2.8.12)
-include(WebKitCommon)
-
add_subdirectory(wtf)
Modified: trunk/Source/WTF/ChangeLog (188435 => 188436)
--- trunk/Source/WTF/ChangeLog 2015-08-14 04:41:26 UTC (rev 188435)
+++ trunk/Source/WTF/ChangeLog 2015-08-14 04:53:20 UTC (rev 188436)
@@ -1,3 +1,16 @@
+2015-08-13 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r188428.
+ https://bugs.webkit.org/show_bug.cgi?id=148015
+
+ broke cmake build (Requested by alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "Move some commands from ./CMakeLists.txt to Source/cmake"
+ https://bugs.webkit.org/show_bug.cgi?id=148003
+ http://trac.webkit.org/changeset/188428
+
2015-08-13 Alex Christensen <[email protected]>
Move some commands from ./CMakeLists.txt to Source/cmake
Modified: trunk/Source/WebCore/CMakeLists.txt (188435 => 188436)
--- trunk/Source/WebCore/CMakeLists.txt 2015-08-14 04:41:26 UTC (rev 188435)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-14 04:53:20 UTC (rev 188436)
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
-include(WebKitCommon)
-
set(WebCore_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}"
"${WEBCORE_DIR}/Modules/airplay"
Modified: trunk/Source/WebCore/ChangeLog (188435 => 188436)
--- trunk/Source/WebCore/ChangeLog 2015-08-14 04:41:26 UTC (rev 188435)
+++ trunk/Source/WebCore/ChangeLog 2015-08-14 04:53:20 UTC (rev 188436)
@@ -1,3 +1,16 @@
+2015-08-13 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r188428.
+ https://bugs.webkit.org/show_bug.cgi?id=148015
+
+ broke cmake build (Requested by alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "Move some commands from ./CMakeLists.txt to Source/cmake"
+ https://bugs.webkit.org/show_bug.cgi?id=148003
+ http://trac.webkit.org/changeset/188428
+
2015-08-13 Zalan Bujtas <[email protected]>
Remove pixelSnapped* functions from RenderBoxModelObject/RenderBox.
Modified: trunk/Source/WebKit/CMakeLists.txt (188435 => 188436)
--- trunk/Source/WebKit/CMakeLists.txt 2015-08-14 04:41:26 UTC (rev 188435)
+++ trunk/Source/WebKit/CMakeLists.txt 2015-08-14 04:53:20 UTC (rev 188436)
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
-include(WebKitCommon)
-
set(WebKit_SOURCES
)
Modified: trunk/Source/WebKit/ChangeLog (188435 => 188436)
--- trunk/Source/WebKit/ChangeLog 2015-08-14 04:41:26 UTC (rev 188435)
+++ trunk/Source/WebKit/ChangeLog 2015-08-14 04:53:20 UTC (rev 188436)
@@ -1,3 +1,16 @@
+2015-08-13 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r188428.
+ https://bugs.webkit.org/show_bug.cgi?id=148015
+
+ broke cmake build (Requested by alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "Move some commands from ./CMakeLists.txt to Source/cmake"
+ https://bugs.webkit.org/show_bug.cgi?id=148003
+ http://trac.webkit.org/changeset/188428
+
2015-08-13 Alex Christensen <[email protected]>
Move some commands from ./CMakeLists.txt to Source/cmake
Deleted: trunk/Source/cmake/WebKitCommon.cmake (188435 => 188436)
--- trunk/Source/cmake/WebKitCommon.cmake 2015-08-14 04:41:26 UTC (rev 188435)
+++ trunk/Source/cmake/WebKitCommon.cmake 2015-08-14 04:53:20 UTC (rev 188436)
@@ -1,9 +0,0 @@
-include(WebKitMacros)
-include(WebKitFS)
-include(WebKitHelpers)
-include(WebKitFeatures)
-
-include(OptionsCommon)
-include(Options${PORT})
-
-CREATE_CONFIGURATION_HEADER()
Modified: trunk/Source/cmake/WebKitFS.cmake (188435 => 188436)
--- trunk/Source/cmake/WebKitFS.cmake 2015-08-14 04:41:26 UTC (rev 188435)
+++ trunk/Source/cmake/WebKitFS.cmake 2015-08-14 04:53:20 UTC (rev 188436)
@@ -1,37 +1,3 @@
-if (NOT BMALLOC_DIR)
- set(BMALLOC_DIR "${CMAKE_SOURCE_DIR}/Source/bmalloc")
-endif ()
-if (NOT WTF_DIR)
- set(WTF_DIR "${CMAKE_SOURCE_DIR}/Source/WTF")
-endif ()
-if (NOT _javascript_CORE_DIR)
- set(_javascript_CORE_DIR "${CMAKE_SOURCE_DIR}/Source/_javascript_Core")
-endif ()
-if (NOT WEBCORE_DIR)
- set(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
-endif ()
-if (NOT WEBKIT_DIR)
- set(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
-endif ()
-if (NOT WEBKIT2_DIR)
- set(WEBKIT2_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit2")
-endif ()
-if (NOT THIRDPARTY_DIR)
- set(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/Source/ThirdParty")
-endif ()
-if (NOT TOOLS_DIR)
- set(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
-endif ()
-
-set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
-set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/_javascript_Core")
-set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
-set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
-set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
-set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
-set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
-set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
-
file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WTF_DIR})
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/_javascript_Core/runtime)
