blob: a41be9ce43c6076e89c3b8f45bb87a008ace2312 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
--- qt5-qtwebkit-5.212.0-git20191114/Source/PlatformQt.cmake.old 2019-11-14 19:31:45.000000000 +0000
+++ qt5-qtwebkit-5.212.0-git20191114/Source/PlatformQt.cmake 2020-01-04 20:53:20.522367347 +0000
@@ -99,8 +99,8 @@
set(Qt5@MODULE_NAME@_EXECUTABLE_COMPILE_FLAGS \"\")
set(Qt5@MODULE_NAME@_PRIVATE_INCLUDE_DIRS \"\") # FIXME: Support private headers
-get_target_property(Qt5@MODULE_NAME@_INCLUDE_DIRS Qt5::@MODULE_NAME@ INTERFACE_INCLUDE_DIRECTORIES)
-get_target_property(Qt5@MODULE_NAME@_COMPILE_DEFINITIONS Qt5::@MODULE_NAME@ INTERFACE_COMPILE_DEFINITIONS)
+get_target_property(Qt5@MODULE_NAME@_INCLUDE_DIRS Qt5::@FULL_MODULE_NAME@ INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(Qt5@MODULE_NAME@_COMPILE_DEFINITIONS Qt5::@FULL_MODULE_NAME@ INTERFACE_COMPILE_DEFINITIONS)
foreach (_module_dep \${_Qt5@MODULE_NAME@_MODULE_DEPENDENCIES})
list(APPEND Qt5@MODULE_NAME@_INCLUDE_DIRS \${Qt5\${_module_dep}_INCLUDE_DIRS})
@@ -117,6 +117,7 @@
")
set(MODULE_NAME WebKit)
+set(FULL_MODULE_NAME WebKitLegacy)
string(CONFIGURE ${_package_footer_template} QTWEBKIT_PACKAGE_FOOTER @ONLY)
ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/Qt5WebKitConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitConfig.cmake"
@@ -124,6 +125,7 @@
)
set(MODULE_NAME WebKitWidgets)
+set(FULL_MODULE_NAME WebKitWidgets)
string(CONFIGURE ${_package_footer_template} QTWEBKIT_PACKAGE_FOOTER @ONLY)
ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/Qt5WebKitWidgetsConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitWidgetsConfig.cmake"
@@ -154,18 +154,18 @@
)
# QTFIXME
-#install(EXPORT WebKitTargets
-# FILE WebKitTargets.cmake
-# NAMESPACE Qt5::
-# DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKit"
-# COMPONENT Data
-#)
-#install(EXPORT Qt5WebKitWidgetsTargets
-# FILE Qt5WebKitWidgetsTargets.cmake
-# NAMESPACE Qt5::
-# DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKitWidgets"
-# COMPONENT Data
-#)
+install(EXPORT WebKitTargets
+ FILE WebKitTargets.cmake
+ NAMESPACE Qt5::
+ DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKit"
+ COMPONENT Data
+)
+install(EXPORT Qt5WebKitWidgetsTargets
+ FILE Qt5WebKitWidgetsTargets.cmake
+ NAMESPACE Qt5::
+ DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKitWidgets"
+ COMPONENT Data
+)
# Documentation
|
