diff options
| author | Qt Forward Merge Bot <[email protected]> | 2019-10-11 12:44:19 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <[email protected]> | 2019-10-11 12:44:19 +0200 |
| commit | ab1bd15209abaf7effc51dbc2f272c5681af7223 (patch) | |
| tree | 680bfbc4ab13514a9d2288609377bd8461f1d9f6 /Source/PlatformQt.cmake | |
| parent | 5909e6d0d10de3e1370b3ea0bc596f580101e3b4 (diff) | |
| parent | 2eac3aeb98fca0e6c13aaaff481861c5ef679e68 (diff) | |
Change-Id: I2b773e6958cf1d3699ff7887f2807572f1dafa8d
Diffstat (limited to 'Source/PlatformQt.cmake')
| -rw-r--r-- | Source/PlatformQt.cmake | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/Source/PlatformQt.cmake b/Source/PlatformQt.cmake index 61648331b..c99d89d70 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) @@ -78,6 +87,29 @@ target_include_directories(WebKitWidgets INTERFACE $<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets> ) +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}\") @@ -153,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 |