Changeset 88991 in webkit

Timestamp:

Jun 15, 2011 7:04:51 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-15 Ryuan Choi <​ryuan.choi@samsung.com>

Rubber stamped by Eric Seidel.

[CMAKE][WK2] Add an option to build webkit2.
​https://bugs.webkit.org/show_bug.cgi?id=62260

Add ENABLE_WEBKIT2 to build WebKit2 using CMake and ENABLE_WEBKIT to disable
WebKit.

• Source/CMakeLists.txt:
• Source/cmake/WebKitFS.cmake:

2011-06-15 Ryuan Choi <​ryuan.choi@samsung.com>

Rubber stamped by Eric Seidel.

[CMAKE][WK2] Add an option to build webkit2.
​https://bugs.webkit.org/show_bug.cgi?id=62260

Add script to build WebKit2 using CMake.

• CMakeLists.txt: Added.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/CMakeLists.txt (modified) (5 diffs)
• Source/WebKit2/CMakeLists.txt (added)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/cmake/WebKitFS.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-06-15  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Rubber stamped by Eric Seidel.
+
+        [CMAKE][WK2] Add an option to build webkit2.
+        https://bugs.webkit.org/show_bug.cgi?id=62260
+
+        Add ENABLE_WEBKIT2 to build WebKit2 using CMake and ENABLE_WEBKIT to disable
+        WebKit.
+
+        * Source/CMakeLists.txt:
+        * Source/cmake/WebKitFS.cmake:
+
 2011-06-14  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Source/CMakeLists.txt

@@ -10 +10 @@
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
+# -----------------------------------------------------------------------------
+# Default library type
+# -----------------------------------------------------------------------------
+IF (NOT ENABLE_WEBKIT AND NOT ENABLE_WEBKIT2)
+    SET(ENABLE_WEBKIT On)
+ENDIF ()
+
 SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/JavaScriptCore")
 SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore")
 SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")
+SET(WEBKIT2_DIR "${CMAKE_SOURCE_DIR}/WebKit2")
+
 SET(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/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_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
+SET(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
 
 INCLUDE(WebKitMacros)
@@ -80 +92 @@
 SET(WebCore_LIBRARY_NAME WebCore)
 SET(WebKit_LIBRARY_NAME WebKit)
+SET(WebKit2_LIBRARY_NAME WebKit2)
 
 # -----------------------------------------------------------------------------
@@ -97 +110 @@
 
 SET(WebKit_LIBRARY_TYPE SHARED)
+SET(WebKit2_LIBRARY_TYPE SHARED)
 
 # -----------------------------------------------------------------------------
@@ -114 +128 @@
 ADD_SUBDIRECTORY(JavaScriptCore)
 ADD_SUBDIRECTORY(WebCore)
-ADD_SUBDIRECTORY(WebKit)
+
+IF (ENABLE_WEBKIT)
+    ADD_SUBDIRECTORY(WebKit)
+ENDIF ()
+
+IF (ENABLE_WEBKIT2)
+    ADD_SUBDIRECTORY(WebKit2)
+ENDIF ()
 
 # -----------------------------------------------------------------------------
@@ -127 +148 @@
 WEBKIT_SET_EXTRA_COMPILER_FLAGS(${JavaScriptCore_LIBRARY_NAME})
 WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCore_LIBRARY_NAME})
-WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebKit_LIBRARY_NAME})
+
+IF (ENABLE_WEBKIT)
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebKit_LIBRARY_NAME})
+ENDIF ()
+
+IF (ENABLE_WEBKIT2)
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebKit2_LIBRARY_NAME})
+ENDIF ()
 
 # -----------------------------------------------------------------------------

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-15  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Rubber stamped by Eric Seidel.
+
+        [CMAKE][WK2] Add an option to build webkit2.
+        https://bugs.webkit.org/show_bug.cgi?id=62260
+
+        Add script to build WebKit2 using CMake.
+
+        * CMakeLists.txt: Added.
+
 2011-06-15  John Sullivan  <sullivan@apple.com>
 

trunk/Source/cmake/WebKitFS.cmake

@@ -3 +3 @@
 FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)
 FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Programs)
+
+IF (ENABLE_WEBKIT2)
+    FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
+ENDIF ()