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 b7cedd4..832889d 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 5185fff..402a1f9 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 86552a9..16b6697 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 dffbc4f..9d77163 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 fad72f5..1d41f30 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 da0aa4e..d58001b 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 4916c3d..bfc9332 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 09753b5..6a881e9 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 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
         https://bugs.webkit.org/show_bug.cgi?id=148030
 

diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
index 1d23fc6..bd512f1 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 6494c96..2509350 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 1f451b6..eb214f4 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 2136b1e..16c38d9 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 b40a395..9701f55 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)