diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2017-10-14 00:59:13 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-10-13 22:23:05 +0000 |
commit | 778e0c7c940f8a22f9a43290aef378fb707ca088 (patch) | |
tree | 6c5d94b52c655e1bee56720005236e917603b63b /Source/WebKit2/PlatformQt.cmake | |
parent | 30af5bd74a1c035f0b3efc73767c0d2bef21333a (diff) |
Import WebKit commit 85c24b4e854b971f0705bb3411cfd4c0b821f491
Change-Id: I3f9320f43d5d1fc5169a6c1b9dcea454974d6578
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2/PlatformQt.cmake')
-rw-r--r-- | Source/WebKit2/PlatformQt.cmake | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake index 5243ef2d8..6bd0627f0 100644 --- a/Source/WebKit2/PlatformQt.cmake +++ b/Source/WebKit2/PlatformQt.cmake @@ -17,6 +17,8 @@ if (${JavaScriptCore_LIBRARY_TYPE} MATCHES STATIC) add_definitions(-DSTATICALLY_LINKED_WITH_WTF -DSTATICALLY_LINKED_WITH_JavaScriptCore) endif () +QTWEBKIT_SKIP_AUTOMOC(WebKit2) + #set(WebKit2_USE_PREFIX_HEADER ON) list(APPEND WebKit2_INCLUDE_DIRECTORIES @@ -280,25 +282,27 @@ list(APPEND WebProcess_SOURCES qt/MainQt.cpp ) +if (NOT SHARED_CORE) + set(WebProcess_LIBRARIES + WebKit + ) + set(NetworkProcess_LIBRARIES + WebKit + ) + set(DatabaseProcess_LIBRARIES + WebKit + ) + set(PluginProcess_LIBRARIES + WebKit + ) +endif () + # FIXME: Allow building without widgets -set(WebProcess_LIBRARIES - WebKit +list(APPEND WebProcess_LIBRARIES Qt5::Widgets WebKitWidgets ) -set(NetworkProcess_LIBRARIES - WebKit -) - -set(DatabaseProcess_LIBRARIES - WebKit -) - -set(PluginProcess_LIBRARIES - WebKit -) - list(APPEND NetworkProcess_SOURCES NetworkProcess/EntryPoint/qt/NetworkProcessMain.cpp ) |