diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /CMakeLists.txt | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f81a4542..90ff03ab7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,14 +19,7 @@ ENDIF () SET(ENABLE_TOOLS ON) -OPTION(ONLY_BUILD_JAVASCRIPTCORE "only build JavaScriptCore") -IF (ONLY_BUILD_JAVASCRIPTCORE) - SET(ENABLE_WEBCORE OFF) - SET(ENABLE_WEBKIT OFF) - SET(ENABLE_WEBKIT2 OFF) - SET(ENABLE_TOOLS OFF) -ENDIF () - +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") @@ -38,6 +31,7 @@ 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_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit") SET(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2") SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake") @@ -163,7 +157,3 @@ IF (ENABLE_TOOLS) ADD_SUBDIRECTORY(Tools) ENDIF () -# ----------------------------------------------------------------------------- -# Prints a summary of all enabled/disabled features -# ----------------------------------------------------------------------------- -WEBKIT_PRINT_FEATURES() |