Move some commands from ./CMakeLists.txt to Source/cmake

https://bugs.webkit.org/show_bug.cgi?id=148003

Reviewed by Brent Fulgham.

* CMakeLists.txt:
.:

Moved functionality to WebKitCommon.cmake and WebKitFS.cmake and made conditional
so we can change directory structure from command line parameters.
* Source/cmake/OptionsAppleWin.cmake:
* Source/cmake/OptionsWin.cmake: Copied from Source/cmake/OptionsWindows.cmake.
* Source/cmake/OptionsWinCairo.cmake:
* Source/cmake/OptionsWindows.cmake: Removed.
* Source/cmake/WebKitCommon.cmake: Added.
* Source/cmake/WebKitFS.cmake:

Source/JavaScriptCore:

Added commands needed to build JSC by itself.

Source/WebCore:

Added commands needed to build WebCore by itself.

Source/WebKit:

Added some commands needed to build WebKit by itself.

Source/WTF:

Added commands needed to build WTF by itself.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7cedd4c392fd5ca6755577bbd45b2fbcbc22b81..832889da02e843124f2d7e868f796c38e080ce3a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,28 +1,6 @@
 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 5185fff6eccfc2d83319dc61f3848d6ecc3d077e..402a1f91ad628b1d76f9c553b2c3d0b98926d6e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2015-08-17  Alex Christensen  <achristensen@webkit.org>
+
+        Move some commands from ./CMakeLists.txt to Source/cmake
+        https://bugs.webkit.org/show_bug.cgi?id=148003
+
+        Reviewed by Brent Fulgham.
+
+        * CMakeLists.txt:
+        Moved functionality to WebKitCommon.cmake and WebKitFS.cmake and made conditional 
+        so we can change directory structure from command line parameters.
+        * Source/cmake/OptionsAppleWin.cmake:
+        * Source/cmake/OptionsWin.cmake: Copied from Source/cmake/OptionsWindows.cmake.
+        * Source/cmake/OptionsWinCairo.cmake:
+        * Source/cmake/OptionsWindows.cmake: Removed.
+        * Source/cmake/WebKitCommon.cmake: Added.
+        * Source/cmake/WebKitFS.cmake:
+
 2015-08-13  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r188428.

diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
index 86552a96f79433119e4788df96047d6aa2eddfd9..16b66977353b5d6117ba549cee1884597e89b48e 100644 (file)
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -1,3 +1,6 @@
+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 dffbc4f5e6d052bff232d2fbba55165b6b02187a..9d77163b49cacd87dff7d3bdec6f7b47f2b69e79 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2015-08-17  Alex Christensen  <achristensen@webkit.org>
+
+        Move some commands from ./CMakeLists.txt to Source/cmake
+        https://bugs.webkit.org/show_bug.cgi?id=148003
+
+        Reviewed by Brent Fulgham.
+
+        * CMakeLists.txt:
+        Added commands needed to build JSC by itself.
+
 2015-08-17  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         [ES6] Implement Reflect.get

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

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index da0aa4e3adac42db8c6b19f8c01ff50cc242e64e..d58001ba43972fc86c96d567b3236dbea4bf3396 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,13 @@
+2015-08-17  Alex Christensen  <achristensen@webkit.org>
+
+        Move some commands from ./CMakeLists.txt to Source/cmake
+        https://bugs.webkit.org/show_bug.cgi?id=148003
+
+        Reviewed by Brent Fulgham.
+
+        * CMakeLists.txt:
+        Added commands needed to build WTF by itself.
+
 2015-08-14  Filip Pizlo  <fpizlo@apple.com>
 
         Use WTF::Lock and WTF::Condition instead of WTF::Mutex, WTF::ThreadCondition, std::mutex, and std::condition_variable

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 4916c3d48bdf46ebceb0c99f8a6d534c589f318a..bfc933239b2e4fdc09589ca4244176558589e8c6 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -1,3 +1,6 @@
+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 09753b5947bdc47a2807af59928904f12e40bac2..6a881e99aba4e35e6ed0531c8e4e79d9b94f325a 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2015-08-17  Alex Christensen  <achristensen@webkit.org>
+
+        Move some commands from ./CMakeLists.txt to Source/cmake
+        https://bugs.webkit.org/show_bug.cgi?id=148003
+
+        Reviewed by Brent Fulgham.
+
+        * CMakeLists.txt:
+        Added commands needed to build WebCore by itself.
+
 2015-08-17  Alex Christensen  <achristensen@webkit.org>
 
         Remove unused multisampling check

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

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 6494c96488c5dec5edd792642afbe96789b6c3e0..250935000d25b3e987d3b1a0a52ce600919d5c41 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2015-08-17  Alex Christensen  <achristensen@webkit.org>
+
+        Move some commands from ./CMakeLists.txt to Source/cmake
+        https://bugs.webkit.org/show_bug.cgi?id=148003
+
+        Reviewed by Brent Fulgham.
+
+        * CMakeLists.txt:
+        Added some commands needed to build WebKit by itself.
+
 2015-08-13  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r188428.

diff --git a/Source/cmake/OptionsAppleWin.cmake b/Source/cmake/OptionsAppleWin.cmake
index 1f451b62932621afbb677edfcb3952cea5eca046..eb214f47f788f41883428f7aae68c6bececc2eff 100644 (file)
--- a/Source/cmake/OptionsAppleWin.cmake
+++ b/Source/cmake/OptionsAppleWin.cmake
@@ -1,4 +1,4 @@
-include(OptionsWindows)
+include(OptionsWin)
 
 set(USE_CG 1)
 set(USE_CA 1)

diff --git a/Source/cmake/OptionsWindows.cmake b/Source/cmake/OptionsWin.cmake
similarity index 100%
rename from Source/cmake/OptionsWindows.cmake
rename to Source/cmake/OptionsWin.cmake

diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake
index 2136b1e97db9f61af2b2d2679de1827e4e789ee9..16c38d9724e8ad762316c33783084e208924ebd1 100644 (file)
--- a/Source/cmake/OptionsWinCairo.cmake
+++ b/Source/cmake/OptionsWinCairo.cmake
@@ -1,6 +1,6 @@
 set(WTF_PLATFORM_WIN_CAIRO 1)
 
-include(OptionsWindows)
+include(OptionsWin)
 
 set(USE_CF 1)
 set(USE_CURL 1)

diff --git a/Source/cmake/WebKitCommon.cmake b/Source/cmake/WebKitCommon.cmake
new file mode 100644 (file)
index 0000000..032cae9
--- /dev/null
+++ b/Source/cmake/WebKitCommon.cmake
@@ -0,0 +1,9 @@
+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 b40a395d51524c16bc835cdcf91cc32c67faaefb..9701f55d68d2ea4e689efc584da9021f3ab0f9c1 100644 (file)
--- a/Source/cmake/WebKitFS.cmake
+++ b/Source/cmake/WebKitFS.cmake
@@ -1,3 +1,37 @@
+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)