Title: [231609] releases/WebKitGTK/webkit-2.20/Source/WebKit
- Revision
- 231609
- Author
- [email protected]
- Date
- 2018-05-09 16:58:52 -0700 (Wed, 09 May 2018)
Log Message
Merge r230449 - [WPE] Add API version to library soname and pkg-config files
https://bugs.webkit.org/show_bug.cgi?id=180608
Reviewed by Žan Doberšek.
* PlatformWPE.cmake:
* wpe/wpe-webkit.pc.in:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog (231608 => 231609)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-05-09 23:58:49 UTC (rev 231608)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-05-09 23:58:52 UTC (rev 231609)
@@ -1,5 +1,15 @@
2018-04-09 Michael Catanzaro <[email protected]>
+ [WPE] Add API version to library soname and pkg-config files
+ https://bugs.webkit.org/show_bug.cgi?id=180608
+
+ Reviewed by Žan Doberšek.
+
+ * PlatformWPE.cmake:
+ * wpe/wpe-webkit.pc.in:
+
+2018-04-09 Michael Catanzaro <[email protected]>
+
[WPE] Use GNU install directories
https://bugs.webkit.org/show_bug.cgi?id=184377
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/PlatformWPE.cmake (231608 => 231609)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/PlatformWPE.cmake 2018-05-09 23:58:49 UTC (rev 231608)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/PlatformWPE.cmake 2018-05-09 23:58:52 UTC (rev 231609)
@@ -1,6 +1,6 @@
include(InspectorGResources.cmake)
-set(WebKit_OUTPUT_NAME WPEWebKit)
+set(WebKit_OUTPUT_NAME WPEWebKit-${WPE_API_VERSION})
set(WebKit_WebProcess_OUTPUT_NAME WPEWebProcess)
set(WebKit_NetworkProcess_OUTPUT_NAME WPENetworkProcess)
set(WebKit_StorageProcess_OUTPUT_NAME WPEStorageProcess)
@@ -9,7 +9,7 @@
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_DIR})
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_EXTENSION_DIR})
-configure_file(wpe/wpe-webkit.pc.in ${CMAKE_BINARY_DIR}/wpe-webkit.pc @ONLY)
+configure_file(wpe/wpe-webkit.pc.in ${CMAKE_BINARY_DIR}/wpe-webkit-${WPE_API_VERSION}.pc @ONLY)
add_definitions(-DWEBKIT2_COMPILATION)
@@ -271,7 +271,7 @@
target_include_directories(WPEInjectedBundle PRIVATE ${WebKit_INCLUDE_DIRECTORIES})
target_include_directories(WPEInjectedBundle SYSTEM PRIVATE ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
-install(FILES "${CMAKE_BINARY_DIR}/wpe-webkit.pc"
+install(FILES "${CMAKE_BINARY_DIR}/wpe-webkit-${WPE_API_VERSION}.pc"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
COMPONENT "Development"
)
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/wpe/wpe-webkit.pc.in (231608 => 231609)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/wpe/wpe-webkit.pc.in 2018-05-09 23:58:49 UTC (rev 231608)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/wpe/wpe-webkit.pc.in 2018-05-09 23:58:52 UTC (rev 231609)
@@ -8,5 +8,5 @@
URL: https://wpewebkit.org
Version: @PROJECT_VERSION@
Requires: glib-2.0 libsoup-2.4
-Libs: -L${libdir} -lWPEWebKit
+Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
Cflags: -I${includedir}/wpe-@WPE_API_VERSION@ -I${includedir}/wpe-@WPE_API_VERSION@/WPE
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
