Skip to content

Commit

Permalink
Merge r223128 - [WPE][CMake] The “install” target should install all …
Browse files Browse the repository at this point in the history
…public API headers

https://bugs.webkit.org/show_bug.cgi?id=176475

Reviewed by Žan Doberšek.

Install the WPE port GLib-based API headers. The deprecated C API is still available,
but disabled by default behind the "EXPORT_DEPRECATED_WEBKIT2_C_API" CMake option.

* PlatformWPE.cmake: Always install "wpe-webkit.pc" and the GLib C API for WPE.
  • Loading branch information
aperezdc authored and carlosgcampos committed Oct 17, 2017
1 parent b8cfcff commit 57833ea
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 5 deletions.
12 changes: 12 additions & 0 deletions Source/WebKit/ChangeLog
@@ -1,3 +1,15 @@
2017-10-10 Adrian Perez de Castro <aperez@igalia.com>

[WPE][CMake] The “install” target should install all public API headers
https://bugs.webkit.org/show_bug.cgi?id=176475

Reviewed by Žan Doberšek.

Install the WPE port GLib-based API headers. The deprecated C API is still available,
but disabled by default behind the "EXPORT_DEPRECATED_WEBKIT2_C_API" CMake option.

* PlatformWPE.cmake: Always install "wpe-webkit.pc" and the GLib C API for WPE.

2017-10-09 Adrian Perez de Castro <aperez@igalia.com>

[WPE][GTK] Propagate libepoxy compiler flags obtained from pkg-config
Expand Down
15 changes: 10 additions & 5 deletions Source/WebKit/PlatformWPE.cmake
Expand Up @@ -623,9 +623,14 @@ if (EXPORT_DEPRECATED_WEBKIT2_C_API)
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-${WPE_API_VERSION}/WPE"
COMPONENT "Development"
)

install(FILES ${CMAKE_BINARY_DIR}/wpe-webkit.pc
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
COMPONENT "Development"
)
endif ()

install(FILES "${CMAKE_BINARY_DIR}/wpe-webkit.pc"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
COMPONENT "Development"
)

install(FILES ${WPE_API_INSTALLED_HEADERS}
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-${WPE_API_VERSION}/WPE/wpe"
COMPONENT "Development"
)

0 comments on commit 57833ea

Please sign in to comment.