Merge r230449 - [WPE] Add API version to library soname and pkg-confi…

…g files https://bugs.webkit.org/show_bug.cgi?id=180608 Reviewed by Žan Doberšek. * PlatformWPE.cmake: * wpe/wpe-webkit.pc.in:
WebKit · May 9, 2018 · 2078291 · 2078291
1 parent cda85ae
commit 2078291
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2018-04-09  Michael Catanzaro  <mcatanzaro@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  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         [WPE] Use GNU install directories

diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake
@@ -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 ${DERIVED_SOURCES_WPE_API_DIR})
 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_link_libraries(WPEInjectedBundle WebKit)
 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"
 )

diff --git a/Source/WebKit/wpe/wpe-webkit.pc.in b/Source/WebKit/wpe/wpe-webkit.pc.in
@@ -8,5 +8,5 @@ Description: Embeddable Web content engine
 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