Title: [103417] trunk
- Revision
- 103417
- Author
- dba...@webkit.org
- Date
- 2011-12-21 11:05:26 -0800 (Wed, 21 Dec 2011)
Log Message
Add CMake option to only build _javascript_Core
https://bugs.webkit.org/show_bug.cgi?id=74979
Reviewed by Rob Buis.
Towards adding CMake support to script Tools/Scripts/build-jsc, add a CMake
option to only build _javascript_Core.
* CMakeLists.txt: Defined ENABLE_WEBCORE to build WebCore. If the option
ONLY_BUILD_JAVASCRIPTCORE is specified then don't build WebCore, WebKit, or WebKit2.
* Source/CMakeLists.txt:
* Source/cmake/WebKitFS.cmake:
Modified Paths
Diff
Modified: trunk/CMakeLists.txt (103416 => 103417)
--- trunk/CMakeLists.txt 2011-12-21 18:56:12 UTC (rev 103416)
+++ trunk/CMakeLists.txt 2011-12-21 19:05:26 UTC (rev 103417)
@@ -11,10 +11,19 @@
# -----------------------------------------------------------------------------
# Default library type
# -----------------------------------------------------------------------------
+SET(ENABLE_WEBCORE On)
+
IF (NOT ENABLE_WEBKIT AND NOT ENABLE_WEBKIT2)
SET(ENABLE_WEBKIT On)
ENDIF ()
+OPTION(ONLY_BUILD_JAVASCRIPTCORE "only build _javascript_Core")
+IF (ONLY_BUILD_JAVASCRIPTCORE)
+ SET(ENABLE_WEBCORE Off)
+ SET(ENABLE_WEBKIT Off)
+ SET(ENABLE_WEBKIT2 Off)
+ENDIF ()
+
SET(_javascript_CORE_DIR "${CMAKE_SOURCE_DIR}/Source/_javascript_Core")
SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
Modified: trunk/ChangeLog (103416 => 103417)
--- trunk/ChangeLog 2011-12-21 18:56:12 UTC (rev 103416)
+++ trunk/ChangeLog 2011-12-21 19:05:26 UTC (rev 103417)
@@ -1,3 +1,18 @@
+2011-12-21 Daniel Bates <dba...@webkit.org>
+
+ Add CMake option to only build _javascript_Core
+ https://bugs.webkit.org/show_bug.cgi?id=74979
+
+ Reviewed by Rob Buis.
+
+ Towards adding CMake support to script Tools/Scripts/build-jsc, add a CMake
+ option to only build _javascript_Core.
+
+ * CMakeLists.txt: Defined ENABLE_WEBCORE to build WebCore. If the option
+ ONLY_BUILD_JAVASCRIPTCORE is specified then don't build WebCore, WebKit, or WebKit2.
+ * Source/CMakeLists.txt:
+ * Source/cmake/WebKitFS.cmake:
+
2011-12-20 Ilya Tikhonovsky <loi...@chromium.org>
emacs: unreviewed. add settings for editing js files.
Modified: trunk/Source/CMakeLists.txt (103416 => 103417)
--- trunk/Source/CMakeLists.txt 2011-12-21 18:56:12 UTC (rev 103416)
+++ trunk/Source/CMakeLists.txt 2011-12-21 19:05:26 UTC (rev 103417)
@@ -2,8 +2,11 @@
# Add module directories
# -----------------------------------------------------------------------------
ADD_SUBDIRECTORY(_javascript_Core)
-ADD_SUBDIRECTORY(WebCore)
+IF (ENABLE_WEBCORE)
+ ADD_SUBDIRECTORY(WebCore)
+ENDIF ()
+
IF (ENABLE_WEBKIT)
ADD_SUBDIRECTORY(WebKit)
ENDIF ()
@@ -17,8 +20,11 @@
# -----------------------------------------------------------------------------
WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WTF_LIBRARY_NAME})
WEBKIT_SET_EXTRA_COMPILER_FLAGS(${_javascript_Core_LIBRARY_NAME})
-WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCore_LIBRARY_NAME})
+IF (ENABLE_WEBCORE)
+ WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCore_LIBRARY_NAME})
+ENDIF ()
+
IF (ENABLE_WEBKIT)
WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebKit_LIBRARY_NAME})
ENDIF ()
Modified: trunk/Source/cmake/WebKitFS.cmake (103416 => 103417)
--- trunk/Source/cmake/WebKitFS.cmake 2011-12-21 18:56:12 UTC (rev 103416)
+++ trunk/Source/cmake/WebKitFS.cmake 2011-12-21 19:05:26 UTC (rev 103417)
@@ -1,8 +1,11 @@
-FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/_javascript_Core/runtime)
FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Programs)
+IF (ENABLE_WEBCORE)
+ FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
+ENDIF ()
+
IF (ENABLE_WEBKIT2)
FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
ENDIF ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
