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
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)
+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.
+cmake_minimum_required(VERSION 2.8.12)
+include(WebKitCommon)
+
set(JavaScriptCore_INCLUDE_DIRECTORIES
"${CMAKE_BINARY_DIR}"
"${JAVASCRIPTCORE_DIR}"
+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
+cmake_minimum_required(VERSION 2.8.12)
+include(WebKitCommon)
+
add_subdirectory(wtf)
+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
+cmake_minimum_required(VERSION 2.8.12)
+include(WebKitCommon)
+
set(WebCore_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}"
"${WEBCORE_DIR}/Modules/airplay"
+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
+cmake_minimum_required(VERSION 2.8.12)
+include(WebKitCommon)
+
set(WebKit_SOURCES
)
+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.
-include(OptionsWindows)
+include(OptionsWin)
set(USE_CG 1)
set(USE_CA 1)
set(WTF_PLATFORM_WIN_CAIRO 1)
-include(OptionsWindows)
+include(OptionsWin)
set(USE_CF 1)
set(USE_CURL 1)
--- /dev/null
+include(WebKitMacros)
+include(WebKitFS)
+include(WebKitHelpers)
+include(WebKitFeatures)
+
+include(OptionsCommon)
+include(Options${PORT})
+
+CREATE_CONFIGURATION_HEADER()
+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)