Changeset 103417 in webkit


Ignore:
Timestamp:
Dec 21, 2011 11:05:26 AM (12 years ago)
Author:
dbates@webkit.org
Message:

Add CMake option to only build JavaScriptCore
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 JavaScriptCore.

  • 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:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r101052 r103417  
    1212# Default library type
    1313# -----------------------------------------------------------------------------
     14SET(ENABLE_WEBCORE On)
     15
    1416IF (NOT ENABLE_WEBKIT AND NOT ENABLE_WEBKIT2)
    1517    SET(ENABLE_WEBKIT On)
     18ENDIF ()
     19
     20OPTION(ONLY_BUILD_JAVASCRIPTCORE "only build JavaScriptCore")
     21IF (ONLY_BUILD_JAVASCRIPTCORE)
     22    SET(ENABLE_WEBCORE Off)
     23    SET(ENABLE_WEBKIT Off)
     24    SET(ENABLE_WEBKIT2 Off)
    1625ENDIF ()
    1726
  • trunk/ChangeLog

    r103334 r103417  
     12011-12-21  Daniel Bates  <dbates@webkit.org>
     2
     3        Add CMake option to only build JavaScriptCore
     4        https://bugs.webkit.org/show_bug.cgi?id=74979
     5
     6        Reviewed by Rob Buis.
     7
     8        Towards adding CMake support to script Tools/Scripts/build-jsc, add a CMake
     9        option to only build JavaScriptCore.
     10
     11        * CMakeLists.txt: Defined ENABLE_WEBCORE to build WebCore. If the option
     12        ONLY_BUILD_JAVASCRIPTCORE is specified then don't build WebCore, WebKit, or WebKit2.
     13        * Source/CMakeLists.txt:
     14        * Source/cmake/WebKitFS.cmake:
     15
    1162011-12-20  Ilya Tikhonovsky  <loislo@chromium.org>
    217
  • trunk/Source/CMakeLists.txt

    r101052 r103417  
    33# -----------------------------------------------------------------------------
    44ADD_SUBDIRECTORY(JavaScriptCore)
    5 ADD_SUBDIRECTORY(WebCore)
     5
     6IF (ENABLE_WEBCORE)
     7    ADD_SUBDIRECTORY(WebCore)
     8ENDIF ()
    69
    710IF (ENABLE_WEBKIT)
     
    1821WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WTF_LIBRARY_NAME})
    1922WEBKIT_SET_EXTRA_COMPILER_FLAGS(${JavaScriptCore_LIBRARY_NAME})
    20 WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCore_LIBRARY_NAME})
     23
     24IF (ENABLE_WEBCORE)
     25    WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCore_LIBRARY_NAME})
     26ENDIF ()
    2127
    2228IF (ENABLE_WEBKIT)
  • trunk/Source/cmake/WebKitFS.cmake

    r88991 r103417  
    1 FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
    21FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
    32FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)
    43FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Programs)
    54
     5IF (ENABLE_WEBCORE)
     6    FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
     7ENDIF ()
     8
    69IF (ENABLE_WEBKIT2)
    710    FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
Note: See TracChangeset for help on using the changeset viewer.