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

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 832889d..b7cedd4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
+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/JavaScriptCore")
+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)

diff --git a/ChangeLog b/ChangeLog
index aa5d653..5185fff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2015-08-13  Commit Queue  <commit-queue@webkit.org>
+
+        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  <achristensen@webkit.org>
 
         Move some commands from ./CMakeLists.txt to Source/cmake

diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
index 30298b6..9d4d207 100644 (file)
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
-include(WebKitCommon)
-
 set(JavaScriptCore_INCLUDE_DIRECTORIES
     "${CMAKE_BINARY_DIR}"
     "${JAVASCRIPTCORE_DIR}"

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 5e5c9db..efd55bf 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,5 +1,18 @@
 2015-08-13  Commit Queue  <commit-queue@webkit.org>
 
+        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  <commit-queue@webkit.org>
+
         Unreviewed, rolling out r188431.
         https://bugs.webkit.org/show_bug.cgi?id=148013
 

diff --git a/Source/WTF/CMakeLists.txt b/Source/WTF/CMakeLists.txt
index 1d41f30..fad72f5 100644 (file)
--- a/Source/WTF/CMakeLists.txt
+++ b/Source/WTF/CMakeLists.txt
@@ -1,4 +1 @@
-cmake_minimum_required(VERSION 2.8.12)
-include(WebKitCommon)
-
 add_subdirectory(wtf)

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index a7f069c..221dee2 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,16 @@
+2015-08-13  Commit Queue  <commit-queue@webkit.org>
+
+        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  <achristensen@webkit.org>
 
         Move some commands from ./CMakeLists.txt to Source/cmake

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 2bece11..e68321e 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
-include(WebKitCommon)
-
 set(WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}"
     "${WEBCORE_DIR}/Modules/airplay"

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 3ef04b7..23f2bee 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2015-08-13  Commit Queue  <commit-queue@webkit.org>
+
+        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  <zalan@apple.com>
 
         Remove pixelSnapped* functions from RenderBoxModelObject/RenderBox.

diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
index bd512f1..1d23fc6 100644 (file)
--- a/Source/WebKit/CMakeLists.txt
+++ b/Source/WebKit/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
-include(WebKitCommon)
-
 set(WebKit_SOURCES
 )
 

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index e147798..6494c96 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2015-08-13  Commit Queue  <commit-queue@webkit.org>
+
+        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  <achristensen@webkit.org>
 
         Move some commands from ./CMakeLists.txt to Source/cmake

diff --git a/Source/cmake/WebKitCommon.cmake b/Source/cmake/WebKitCommon.cmake
deleted file mode 100644 (file)
index 032cae9..0000000
--- a/Source/cmake/WebKitCommon.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-include(WebKitMacros)
-include(WebKitFS)
-include(WebKitHelpers)
-include(WebKitFeatures)
-
-include(OptionsCommon)
-include(Options${PORT})
-
-CREATE_CONFIGURATION_HEADER()

diff --git a/Source/cmake/WebKitFS.cmake b/Source/cmake/WebKitFS.cmake
index 9701f55..b40a395 100644 (file)
--- a/Source/cmake/WebKitFS.cmake
+++ b/Source/cmake/WebKitFS.cmake
@@ -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 JAVASCRIPTCORE_DIR)
-    set(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
-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/JavaScriptCore")
-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/JavaScriptCore/runtime)