diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-09-30 15:43:24 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:31:05 +0000 |
| commit | a0be5222b8695aed31664ab4e8e804632569ed64 (patch) | |
| tree | fe477e98b7aecd302b2176264046ceac0cfe6236 /Source/JavaScriptCore | |
| parent | 9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c (diff) | |
| download | qtwebkit-a0be5222b8695aed31664ab4e8e804632569ed64.tar.gz | |
Imported WebKit commit 2730223e8fe1776419fae168986b9e77f55d02d3
Change-Id: I46d453477a779a8db544ffc50d088fa13331da9b
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/JavaScriptCore')
| -rw-r--r-- | Source/JavaScriptCore/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/JavaScriptCore/PlatformQt.cmake | 6 | ||||
| -rw-r--r-- | Source/JavaScriptCore/shell/PlatformQt.cmake | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt index 1504e53a8..d570b8dd0 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt @@ -1318,6 +1318,8 @@ if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED") install(TARGETS JavaScriptCore DESTINATION "${LIB_INSTALL_DIR}") endif () +QT_ADD_EXTRA_WEBKIT_TARGET_EXPORT(JavaScriptCore) + # Force staging of shared scripts, even if they aren't directly used to build JavaScriptCore. add_custom_target(stageSharedScripts DEPENDS ${JavaScriptCore_SCRIPTS}) diff --git a/Source/JavaScriptCore/PlatformQt.cmake b/Source/JavaScriptCore/PlatformQt.cmake index 7bc7f0348..11587f401 100644 --- a/Source/JavaScriptCore/PlatformQt.cmake +++ b/Source/JavaScriptCore/PlatformQt.cmake @@ -18,6 +18,12 @@ list(APPEND JavaScriptCore_LIBRARIES ${Qt5Core_LIBRARIES} ) +if (QT_STATIC_BUILD) + list(APPEND JavaScriptCore_LIBRARIES + ${STATIC_LIB_DEPENDENCIES} + ) +endif () + # From PlatformWin.cmake if (WIN32) list(REMOVE_ITEM JavaScriptCore_SOURCES diff --git a/Source/JavaScriptCore/shell/PlatformQt.cmake b/Source/JavaScriptCore/shell/PlatformQt.cmake new file mode 100644 index 000000000..55640eb3a --- /dev/null +++ b/Source/JavaScriptCore/shell/PlatformQt.cmake @@ -0,0 +1,5 @@ +if (QT_STATIC_BUILD) + list(APPEND JSC_LIBRARIES + ${DEPEND_STATIC_LIBS} + ) +endif () |