178 lines
7.0 KiB
Diff
178 lines
7.0 KiB
Diff
From dc9ff80e6341913d1077fb4ffe23aed6754dcd96 Mon Sep 17 00:00:00 2001
|
|
From: Konstantin Tokarev <annulen@yandex.ru>
|
|
Date: Fri, 3 Nov 2017 18:59:25 +0300
|
|
Subject: [PATCH] Install private headers for WK2 and private .pri modules
|
|
|
|
Change-Id: Ie2f52c600180fd31cc5fac2f5d30952df28ea9d6
|
|
---
|
|
Source/WebKit/PlatformQt.cmake | 74 +++++++++++++++++++++++++++++++++++++++--
|
|
Source/cmake/WebKitMacros.cmake | 2 --
|
|
2 files changed, 71 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
|
|
index 8708cedf8463..f0e4acf8a5a6 100644
|
|
--- a/Source/WebKit/PlatformQt.cmake
|
|
+++ b/Source/WebKit/PlatformQt.cmake
|
|
@@ -418,7 +418,7 @@ install(
|
|
COMPONENT Data
|
|
)
|
|
|
|
-file(GLOB WebKit_PRIVATE_HEADERS qt/Api/*_p.h)
|
|
+file(GLOB WebKit_PRIVATE_HEADERS qt/Api/*_p.h ../WebKit2/UIProcess/API/qt/*_p.h)
|
|
install(
|
|
FILES
|
|
${WebKit_PRIVATE_HEADERS}
|
|
@@ -519,11 +519,19 @@ if (KDE_INSTALL_USE_QT_SYS_PATHS)
|
|
INCLUDE_INSTALL_DIR "$$QT_MODULE_LIB_BASE/QtWebKit.framework/Headers"
|
|
MODULE_CONFIG "lib_bundle"
|
|
)
|
|
+ list(APPEND WebKit_Private_PRI_ARGUMENTS
|
|
+ INCLUDE_INSTALL_DIR "$$QT_MODULE_LIB_BASE/QtWebKit.framework/Headers/${PROJECT_VERSION}"
|
|
+ INCLUDE_INSTALL_DIR2 "$$QT_MODULE_LIB_BASE/QtWebKit.framework/Headers/${PROJECT_VERSION}/QtWebKit"
|
|
+ )
|
|
else ()
|
|
list(APPEND WebKit_PRI_ARGUMENTS
|
|
INCLUDE_INSTALL_DIR "$$QT_MODULE_INCLUDE_BASE"
|
|
INCLUDE_INSTALL_DIR2 "$$QT_MODULE_INCLUDE_BASE/QtWebKit"
|
|
)
|
|
+ list(APPEND WebKit_Private_PRI_ARGUMENTS
|
|
+ INCLUDE_INSTALL_DIR "$$QT_MODULE_INCLUDE_BASE/QtWebKit/${PROJECT_VERSION}"
|
|
+ INCLUDE_INSTALL_DIR2 "$$QT_MODULE_INCLUDE_BASE/QtWebKit/${PROJECT_VERSION}/QtWebKit"
|
|
+ )
|
|
endif ()
|
|
else ()
|
|
set(WebKit_PRI_ARGUMENTS
|
|
@@ -534,14 +542,24 @@ else ()
|
|
INCLUDE_INSTALL_DIR "${LIB_INSTALL_DIR}/QtWebKit.framework/Headers"
|
|
MODULE_CONFIG "lib_bundle"
|
|
)
|
|
+ list(APPEND WebKit_Private_PRI_ARGUMENTS
|
|
+ INCLUDE_INSTALL_DIR "${LIB_INSTALL_DIR}/QtWebKit.framework/Headers/${PROJECT_VERSION}"
|
|
+ INCLUDE_INSTALL_DIR2 "${LIB_INSTALL_DIR}/QtWebKit.framework/Headers/${PROJECT_VERSION}/QtWebKit"
|
|
+ )
|
|
else ()
|
|
list(APPEND WebKit_PRI_ARGUMENTS
|
|
INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}
|
|
INCLUDE_INSTALL_DIR2 "${KDE_INSTALL_INCLUDEDIR}/QtWebKit"
|
|
)
|
|
+ list(APPEND WebKit_Private_PRI_ARGUMENTS
|
|
+ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit/${PROJECT_VERSION}"
|
|
+ INCLUDE_INSTALL_DIR2 "${KDE_INSTALL_INCLUDEDIR}/QtWebKit/${PROJECT_VERSION}/QtWebKit"
|
|
+ )
|
|
endif ()
|
|
endif ()
|
|
|
|
+list(APPEND WebKit_Private_PRI_ARGUMENTS MODULE_CONFIG "internal_module no_link")
|
|
+
|
|
if (MACOS_BUILD_FRAMEWORKS)
|
|
set(WebKit_OUTPUT_NAME QtWebKit)
|
|
else ()
|
|
@@ -561,7 +579,23 @@ ecm_generate_pri_file(
|
|
FILENAME_VAR WebKit_PRI_FILENAME
|
|
${WebKit_PRI_ARGUMENTS}
|
|
)
|
|
-install(FILES ${WebKit_PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR} COMPONENT Data)
|
|
+ecm_generate_pri_file(
|
|
+ BASE_NAME webkit_private
|
|
+ NAME "QtWebKit"
|
|
+ LIB_NAME " "
|
|
+ DEPS "webkit"
|
|
+ RUNTIME_DEPS " "
|
|
+ DEFINES " "
|
|
+ QT_MODULES webkit
|
|
+ EXTRA_LIBS " "
|
|
+ FILENAME_VAR WebKit_Private_PRI_FILENAME
|
|
+ ${WebKit_Private_PRI_ARGUMENTS}
|
|
+)
|
|
+install(
|
|
+ FILES ${WebKit_PRI_FILENAME} ${WebKit_Private_PRI_FILENAME}
|
|
+ DESTINATION ${ECM_MKSPECS_INSTALL_DIR}
|
|
+ COMPONENT Data
|
|
+)
|
|
|
|
if (QT_STATIC_BUILD)
|
|
set(WebKit_LIBRARY_TYPE STATIC)
|
|
@@ -708,11 +742,19 @@ if (KDE_INSTALL_USE_QT_SYS_PATHS)
|
|
INCLUDE_INSTALL_DIR "$$QT_MODULE_LIB_BASE/QtWebKitWidgets.framework/Headers"
|
|
MODULE_CONFIG "lib_bundle"
|
|
)
|
|
+ list(APPEND WebKitWidgets_Private_PRI_ARGUMENTS
|
|
+ INCLUDE_INSTALL_DIR "$$QT_MODULE_LIB_BASE/QtWebKitWidgets.framework/Headers/${PROJECT_VERSION}"
|
|
+ INCLUDE_INSTALL_DIR2 "$$QT_MODULE_LIB_BASE/QtWebKitWidgets.framework/Headers/${PROJECT_VERSION}/QtWebKitWidgets"
|
|
+ )
|
|
else ()
|
|
list(APPEND WebKitWidgets_PRI_ARGUMENTS
|
|
INCLUDE_INSTALL_DIR "$$QT_MODULE_INCLUDE_BASE"
|
|
INCLUDE_INSTALL_DIR2 "$$QT_MODULE_INCLUDE_BASE/QtWebKitWidgets"
|
|
)
|
|
+ list(APPEND WebKitWidgets_Private_PRI_ARGUMENTS
|
|
+ INCLUDE_INSTALL_DIR "$$QT_MODULE_INCLUDE_BASE/QtWebKitWidgets/${PROJECT_VERSION}"
|
|
+ INCLUDE_INSTALL_DIR2 "$$QT_MODULE_INCLUDE_BASE/QtWebKitWidgets/${PROJECT_VERSION}/QtWebKitWidgets"
|
|
+ )
|
|
endif ()
|
|
else ()
|
|
set(WebKitWidgets_PRI_ARGUMENTS
|
|
@@ -723,14 +765,24 @@ else ()
|
|
INCLUDE_INSTALL_DIR "${LIB_INSTALL_DIR}/QtWebKitWidgets.framework/Headers"
|
|
MODULE_CONFIG "lib_bundle"
|
|
)
|
|
+ list(APPEND WebKitWidgets_Private_PRI_ARGUMENTS
|
|
+ INCLUDE_INSTALL_DIR "${LIB_INSTALL_DIR}/QtWebKitWidgets.framework/Headers/${PROJECT_VERSION}"
|
|
+ INCLUDE_INSTALL_DIR2 "${LIB_INSTALL_DIR}/QtWebKitWidgets.framework/Headers/${PROJECT_VERSION}/QtWebKitWidgets"
|
|
+ )
|
|
else ()
|
|
list(APPEND WebKitWidgets_PRI_ARGUMENTS
|
|
INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}
|
|
INCLUDE_INSTALL_DIR2 "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets"
|
|
)
|
|
+ list(APPEND WebKitWidgets_Private_PRI_ARGUMENTS
|
|
+ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets/${PROJECT_VERSION}"
|
|
+ INCLUDE_INSTALL_DIR2 "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets/${PROJECT_VERSION}/QtWebKitWidgets"
|
|
+ )
|
|
endif ()
|
|
endif ()
|
|
|
|
+list(APPEND WebKitWidgets_Private_PRI_ARGUMENTS MODULE_CONFIG "internal_module no_link")
|
|
+
|
|
if (MACOS_BUILD_FRAMEWORKS)
|
|
set(WebKitWidgets_OUTPUT_NAME QtWebKitWidgets)
|
|
else ()
|
|
@@ -749,7 +801,23 @@ ecm_generate_pri_file(
|
|
FILENAME_VAR WebKitWidgets_PRI_FILENAME
|
|
${WebKitWidgets_PRI_ARGUMENTS}
|
|
)
|
|
-install(FILES ${WebKitWidgets_PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR} COMPONENT Data)
|
|
+ecm_generate_pri_file(
|
|
+ BASE_NAME webkitwidgets_private
|
|
+ NAME "QtWebKitWidgets"
|
|
+ LIB_NAME " "
|
|
+ DEPS "webkitwidgets"
|
|
+ RUNTIME_DEPS " "
|
|
+ DEFINES " "
|
|
+ QT_MODULES webkitwidgets
|
|
+ EXTRA_LIBS " "
|
|
+ FILENAME_VAR WebKitWidgets_Private_PRI_FILENAME
|
|
+ ${WebKitWidgets_Private_PRI_ARGUMENTS}
|
|
+)
|
|
+install(
|
|
+ FILES ${WebKitWidgets_PRI_FILENAME} ${WebKitWidgets_Private_PRI_FILENAME}
|
|
+ DESTINATION ${ECM_MKSPECS_INSTALL_DIR}
|
|
+ COMPONENT Data
|
|
+)
|
|
|
|
if (MSVC)
|
|
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
|
|
index 858e2e47d8d5..4c54c1c5de1e 100644
|
|
--- a/Source/cmake/WebKitMacros.cmake
|
|
+++ b/Source/cmake/WebKitMacros.cmake
|
|
@@ -265,8 +265,6 @@ macro(WEBKIT_FRAMEWORK _target)
|
|
${${_target}_HEADERS}
|
|
${${_target}_SOURCES}
|
|
${${_target}_DERIVED_SOURCES}
|
|
- ${${_target}_PRIVATE_HEADERS}
|
|
- ${${_target}_PUBLIC_HEADERS}
|
|
)
|
|
target_link_libraries(${_target} ${${_target}_LIBRARIES})
|
|
set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
|