diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
| commit | 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (patch) | |
| tree | 52599cd0ab782b1768e23ad176f7618f98333cb6 /CMakeLists.txt | |
| parent | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (diff) | |
| download | qtwebkit-03e12282df9aa1e1fb05a8b90f1cfc2e08764cec.tar.gz | |
Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525 (http://svn.webkit.org/repository/webkit/trunk@107223)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c13086747..6e0f98b0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,17 +11,20 @@ ENDIF () # ----------------------------------------------------------------------------- # Default library type # ----------------------------------------------------------------------------- -SET(ENABLE_WEBCORE On) +SET(ENABLE_WEBCORE ON) IF (NOT ENABLE_WEBKIT AND NOT ENABLE_WEBKIT2) - SET(ENABLE_WEBKIT On) + SET(ENABLE_WEBKIT ON) 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_WEBCORE OFF) + SET(ENABLE_WEBKIT OFF) + SET(ENABLE_WEBKIT2 OFF) + SET(ENABLE_TOOLS OFF) ENDIF () SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore") @@ -39,6 +42,9 @@ SET(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2") SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake") +SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + INCLUDE(WebKitMacros) INCLUDE(WebKitFS) INCLUDE(WebKitHelpers) @@ -152,7 +158,9 @@ ADD_SUBDIRECTORY(Source) # ----------------------------------------------------------------------------- # Add tools # ----------------------------------------------------------------------------- -ADD_SUBDIRECTORY(Tools) +IF (ENABLE_TOOLS) + ADD_SUBDIRECTORY(Tools) +ENDIF () # ----------------------------------------------------------------------------- # Prints a summary of all enabled/disabled features |