2018-10-07 09:53:36 +02:00
|
|
|
commit 14947c04b3c19b5eb04a683081742b14c1d32786
|
|
|
|
Author: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
Date: Sat Oct 7 17:38:32 2017 +0300
|
|
|
|
|
|
|
|
[cmake] Fix build with CMake 3.10: -frtti was enabled for wrong file path
|
|
|
|
|
|
|
|
Change-Id: I65d4f491f21c17f6d99a14259988d2ddb0d67105
|
|
|
|
|
2018-10-07 13:27:03 +02:00
|
|
|
--- Source/WebKit/PlatformQt.cmake.orig 2018-10-07 11:03:32 UTC
|
2017-08-20 10:45:48 +02:00
|
|
|
+++ Source/WebKit/PlatformQt.cmake
|
2018-10-07 13:27:03 +02:00
|
|
|
@@ -481,6 +481,8 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
|
2017-08-20 10:45:48 +02:00
|
|
|
BASE_NAME Qt5WebKit
|
|
|
|
DEPS "${WEBKIT_PKGCONGIG_DEPS}"
|
|
|
|
FILENAME_VAR WebKit_PKGCONFIG_FILENAME
|
2018-10-07 09:53:36 +02:00
|
|
|
+ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit"
|
2018-10-07 13:27:03 +02:00
|
|
|
+ DESCRIPTION "Qt WebKit module"
|
2017-08-20 10:45:48 +02:00
|
|
|
)
|
2018-10-07 09:53:36 +02:00
|
|
|
set(ECM_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.")
|
2018-10-07 13:27:03 +02:00
|
|
|
install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
|
|
|
|
@@ -671,6 +673,8 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
|
2017-08-20 10:45:48 +02:00
|
|
|
BASE_NAME Qt5WebKitWidgets
|
|
|
|
DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}"
|
|
|
|
FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME
|
2018-10-07 09:53:36 +02:00
|
|
|
+ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets"
|
2018-10-07 13:27:03 +02:00
|
|
|
+ DESCRIPTION "Qt WebKitWidgets module"
|
2017-08-20 10:45:48 +02:00
|
|
|
)
|
|
|
|
install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
|
2018-10-07 13:27:03 +02:00
|
|
|
endif ()
|