Changeset 230449 in webkit


Ignore:
Timestamp:
Apr 9, 2018 1:03:49 PM (6 years ago)
Author:
Michael Catanzaro
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:
Location:
trunk/Source/WebKit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r230448 r230449  
     12018-04-09  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Add API version to library soname and pkg-config files
     4        https://bugs.webkit.org/show_bug.cgi?id=180608
     5
     6        Reviewed by Žan Doberšek.
     7
     8        * PlatformWPE.cmake:
     9        * wpe/wpe-webkit.pc.in:
     10
    1112018-04-09  Jer Noble  <jer.noble@apple.com>
    212
  • trunk/Source/WebKit/PlatformWPE.cmake

    r230429 r230449  
    11include(InspectorGResources.cmake)
    22
    3 set(WebKit_OUTPUT_NAME WPEWebKit)
     3set(WebKit_OUTPUT_NAME WPEWebKit-${WPE_API_VERSION})
    44set(WebKit_WebProcess_OUTPUT_NAME WPEWebProcess)
    55set(WebKit_NetworkProcess_OUTPUT_NAME WPENetworkProcess)
     
    1111file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_DOM_DIR})
    1212
    13 configure_file(wpe/wpe-webkit.pc.in ${CMAKE_BINARY_DIR}/wpe-webkit.pc @ONLY)
     13configure_file(wpe/wpe-webkit.pc.in ${CMAKE_BINARY_DIR}/wpe-webkit-${WPE_API_VERSION}.pc @ONLY)
    1414
    1515add_definitions(-DWEBKIT2_COMPILATION)
     
    323323target_include_directories(WPEInjectedBundle SYSTEM PRIVATE ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
    324324
    325 install(FILES "${CMAKE_BINARY_DIR}/wpe-webkit.pc"
     325install(FILES "${CMAKE_BINARY_DIR}/wpe-webkit-${WPE_API_VERSION}.pc"
    326326    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
    327327    COMPONENT "Development"
  • trunk/Source/WebKit/wpe/wpe-webkit.pc.in

    r225167 r230449  
    99Version: @PROJECT_VERSION@
    1010Requires: glib-2.0 libsoup-2.4
    11 Libs: -L${libdir} -lWPEWebKit
     11Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
    1212Cflags: -I${includedir}/wpe-@WPE_API_VERSION@ -I${includedir}/wpe-@WPE_API_VERSION@/WPE
Note: See TracChangeset for help on using the changeset viewer.