From 1482978d1e764e0c31c2df8890913d6801a8e065 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 11 Sep 2019 12:41:53 +0300 Subject: Import QtWebKit commit 68b093f76fd3ee458de9d1bbf54e1d5a648a71bd Change-Id: I62abae1d1e60d2cb65514d01fa89ad44308a6ba4 Reviewed-by: Konstantin Tokarev --- Source/PlatformQt.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Source/PlatformQt.cmake') diff --git a/Source/PlatformQt.cmake b/Source/PlatformQt.cmake index 61648331b..2d58228dc 100644 --- a/Source/PlatformQt.cmake +++ b/Source/PlatformQt.cmake @@ -54,6 +54,15 @@ if (USE_MINIMAL_DEBUG_INFO_MSVC AND MSVC AND CMAKE_BUILD_TYPE STREQUAL "Debug") endif () endif () +if (FORCE_DEBUG_INFO) + if (COMPILER_IS_GCC_OR_CLANG) + if (NOT APPLE) + target_compile_options(WebKit PRIVATE -fdebug-types-section) + target_compile_options(WebKit2 PRIVATE -fdebug-types-section) + endif () + endif () +endif () + # GTest if (TARGET gtest) -- cgit v1.2.3 From 2eac3aeb98fca0e6c13aaaff481861c5ef679e68 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 8 Oct 2019 01:20:22 +0300 Subject: Import QtWebKit commit 5e53102492e5ce85bda2657468f1369a0173c2ce Change-Id: Id71d7c7f5eafe58f7bd8c46a2a07fd0bad015628 Reviewed-by: Konstantin Tokarev --- Source/PlatformQt.cmake | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'Source/PlatformQt.cmake') diff --git a/Source/PlatformQt.cmake b/Source/PlatformQt.cmake index 2d58228dc..c99d89d70 100644 --- a/Source/PlatformQt.cmake +++ b/Source/PlatformQt.cmake @@ -87,6 +87,29 @@ target_include_directories(WebKitWidgets INTERFACE $ ) +if (QT_ORIGIN_RPATH) + set(WEBKIT_SHARED_LIBRARY_TARGETS WebKit) + + if (TARGET WebKitWidgets) + list(APPEND WEBKIT_SHARED_LIBRARY_TARGETS WebKitWidgets) + endif () + + if (TARGET WebKit2) + set(WEBKIT2_EXECUTABLES WebProcess NetworkProcess) + if (ENABLE_PLUGIN_PROCESS) + list(APPEND WEBKIT2_EXECUTABLES PluginProcess) + endif () + if (ENABLE_DATABASE_PROCESS) + list(APPEND WEBKIT2_EXECUTABLES DatabaseProcess) + endif () + set_target_properties(${WEBKIT2_EXECUTABLES} PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") + set_target_properties(qmlwebkitplugin PROPERTIES INSTALL_RPATH "\$ORIGIN/../../lib") + set_target_properties(qmlwebkitexperimentalplugin PROPERTIES INSTALL_RPATH "\$ORIGIN/../../../lib") + endif () + + set_target_properties(${WEBKIT_SHARED_LIBRARY_TARGETS} PROPERTIES INSTALL_RPATH "\$ORIGIN") +endif () + set(QTWEBKIT_PACKAGE_INIT " macro(find_dependency_with_major_and_minor _dep _major _minor) find_dependency(\${_dep} \"\${_major}.\${_minor}\") @@ -162,17 +185,18 @@ install(FILES COMPONENT Data ) +# We need to install separate config files for debug and release, so use "Code" component install(EXPORT WebKitTargets FILE WebKitTargets.cmake NAMESPACE Qt5:: DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKit" - COMPONENT Data + COMPONENT Code ) install(EXPORT Qt5WebKitWidgetsTargets FILE Qt5WebKitWidgetsTargets.cmake NAMESPACE Qt5:: DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKitWidgets" - COMPONENT Data + COMPONENT Code ) # Documentation -- cgit v1.2.3