diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
| commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
| tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /CMakeLists.txt | |
| parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e0f98b0a..4f81a4542 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,7 @@ SET(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2") SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake") +SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) @@ -115,24 +116,24 @@ SET(JavaScriptCore_LIBRARY_NAME JavaScriptCore) SET(WebCore_LIBRARY_NAME WebCore) SET(WebKit_LIBRARY_NAME WebKit) SET(WebKit2_LIBRARY_NAME WebKit2) +SET(WebCoreTestSupport_LIBRARY_NAME WebCoreTestSupport) # ----------------------------------------------------------------------------- # Default library types # ----------------------------------------------------------------------------- -OPTION(SHARED_CORE "build WTF, JavaScriptCore and WebCore as shared libraries") +OPTION(SHARED_CORE "build JavaScriptCore and WebCore as shared libraries") IF (SHARED_CORE) - SET(WTF_LIBRARY_TYPE SHARED) SET(JavaScriptCore_LIBRARY_TYPE SHARED) SET(WebCore_LIBRARY_TYPE SHARED) ELSE () - SET(WTF_LIBRARY_TYPE STATIC) SET(JavaScriptCore_LIBRARY_TYPE STATIC) SET(WebCore_LIBRARY_TYPE STATIC) ENDIF () SET(WebKit_LIBRARY_TYPE SHARED) SET(WebKit2_LIBRARY_TYPE SHARED) +SET(WebCoreTestSupport_LIBRARY_TYPE STATIC) # ----------------------------------------------------------------------------- # Port-specific options |