Changeset 103417 in webkit
- Timestamp:
- Dec 21, 2011 11:05:26 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r101052 r103417 12 12 # Default library type 13 13 # ----------------------------------------------------------------------------- 14 SET(ENABLE_WEBCORE On) 15 14 16 IF (NOT ENABLE_WEBKIT AND NOT ENABLE_WEBKIT2) 15 17 SET(ENABLE_WEBKIT On) 18 ENDIF () 19 20 OPTION(ONLY_BUILD_JAVASCRIPTCORE "only build JavaScriptCore") 21 IF (ONLY_BUILD_JAVASCRIPTCORE) 22 SET(ENABLE_WEBCORE Off) 23 SET(ENABLE_WEBKIT Off) 24 SET(ENABLE_WEBKIT2 Off) 16 25 ENDIF () 17 26 -
trunk/ChangeLog
r103334 r103417 1 2011-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 1 16 2011-12-20 Ilya Tikhonovsky <loislo@chromium.org> 2 17 -
trunk/Source/CMakeLists.txt
r101052 r103417 3 3 # ----------------------------------------------------------------------------- 4 4 ADD_SUBDIRECTORY(JavaScriptCore) 5 ADD_SUBDIRECTORY(WebCore) 5 6 IF (ENABLE_WEBCORE) 7 ADD_SUBDIRECTORY(WebCore) 8 ENDIF () 6 9 7 10 IF (ENABLE_WEBKIT) … … 18 21 WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WTF_LIBRARY_NAME}) 19 22 WEBKIT_SET_EXTRA_COMPILER_FLAGS(${JavaScriptCore_LIBRARY_NAME}) 20 WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCore_LIBRARY_NAME}) 23 24 IF (ENABLE_WEBCORE) 25 WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCore_LIBRARY_NAME}) 26 ENDIF () 21 27 22 28 IF (ENABLE_WEBKIT) -
trunk/Source/cmake/WebKitFS.cmake
r88991 r103417 1 FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})2 1 FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}) 3 2 FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime) 4 3 FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Programs) 5 4 5 IF (ENABLE_WEBCORE) 6 FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}) 7 ENDIF () 8 6 9 IF (ENABLE_WEBKIT2) 7 10 FILE(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
Note: See TracChangeset
for help on using the changeset viewer.