Title: [230449] trunk/Source/WebKit
- Revision
- 230449
- Author
- mcatanz...@igalia.com
- Date
- 2018-04-09 13:03:49 -0700 (Mon, 09 Apr 2018)
Log Message
[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: trunk/Source/WebKit/ChangeLog (230448 => 230449)
--- trunk/Source/WebKit/ChangeLog 2018-04-09 19:58:17 UTC (rev 230448)
+++ trunk/Source/WebKit/ChangeLog 2018-04-09 20:03:49 UTC (rev 230449)
@@ -1,3 +1,13 @@
+2018-04-09 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [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 Jer Noble <jer.no...@apple.com>
Fix the selection assistant selectionView build
Modified: trunk/Source/WebKit/PlatformWPE.cmake (230448 => 230449)
--- trunk/Source/WebKit/PlatformWPE.cmake 2018-04-09 19:58:17 UTC (rev 230448)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2018-04-09 20:03:49 UTC (rev 230449)
@@ -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)
@@ -10,7 +10,7 @@
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_EXTENSION_DIR})
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_DOM_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)
@@ -322,7 +322,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: trunk/Source/WebKit/wpe/wpe-webkit.pc.in (230448 => 230449)
--- trunk/Source/WebKit/wpe/wpe-webkit.pc.in 2018-04-09 19:58:17 UTC (rev 230448)
+++ trunk/Source/WebKit/wpe/wpe-webkit.pc.in 2018-04-09 20:03:49 UTC (rev 230449)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
