[libwebm] Install the public header files (#22189)

* [libwebm] Remove port's internal headers from installed folder

* [libwebm] Install public headers

* [libwebm] Resetting the file structure of libwebm/include and adding additional headers

Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
This commit is contained in:
Cheney Wang 2021-12-30 04:01:35 +08:00 committed by GitHub
parent dcb54b2af0
commit b11941140c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 16 deletions

View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a83d23b..0f5ede3 100644
index a83d23b..c5abf83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,8 @@
@ -11,7 +11,7 @@ index a83d23b..0f5ede3 100644
include(GNUInstallDirs)
include("${CMAKE_CURRENT_SOURCE_DIR}/build/cxx_flags.cmake")
@@ -330,6 +332,30 @@ add_library(webm ${libwebm_common_sources}
@@ -330,6 +332,50 @@ add_library(webm ${libwebm_common_sources}
$<TARGET_OBJECTS:mkvmuxer>
$<TARGET_OBJECTS:mkvparser>)
@ -24,25 +24,45 @@ index a83d23b..0f5ede3 100644
+
+install(
+ FILES
+ mkvmuxer/mkvmuxer.h
+ mkvmuxer/mkvmuxertypes.h
+ mkvmuxer/mkvmuxerutil.h
+ mkvmuxer/mkvwriter.h
+ mkvparser/mkvparser.h
+ mkvparser/mkvreader.h
+ webvtt/vttreader.h
+ webvtt/webvttparser.h
+ common/file_util.h
+ common/hdr_util.h
+ common/webmids.h
+ mkvmuxer.hpp
+ mkvmuxertypes.hpp
+ mkvmuxerutil.hpp
+ mkvparser.hpp
+ mkvreader.hpp
+ mkvwriter.hpp
+ webmids.hpp
+ DESTINATION
+ "include/libwebm/"
+ include/libwebm
+)
+
+install(
+ DIRECTORY mkvmuxer/
+ DESTINATION include/libwebm/mkvmuxer
+ FILES_MATCHING PATTERN "*.h"
+)
+
+install(
+ DIRECTORY mkvparser/
+ DESTINATION include/libwebm/mkvparser
+ FILES_MATCHING PATTERN "*.h"
+)
+
+install(
+ DIRECTORY webvtt/
+ DESTINATION include/libwebm/webvtt
+ FILES_MATCHING PATTERN "*.h"
+)
+
+install(
+ DIRECTORY common/
+ DESTINATION include/libwebm/common
+ FILES_MATCHING PATTERN "*.h"
+)
+
if (WIN32)
# Use libwebm and libwebm.lib for project and library name on Windows (instead
# webm and webm.lib).
@@ -337,18 +363,22 @@ if (WIN32)
@@ -337,18 +383,22 @@ if (WIN32)
set_target_properties(webm PROPERTIES PREFIX lib)
endif ()

View File

@ -1,6 +1,7 @@
{
"name": "libwebm",
"version": "1.0.0.28",
"port-version": 1,
"description": "WebM File Parser",
"homepage": "https://github.com/webmproject/libwebm",
"dependencies": [

View File

@ -4070,7 +4070,7 @@
},
"libwebm": {
"baseline": "1.0.0.28",
"port-version": 0
"port-version": 1
},
"libwebp": {
"baseline": "1.2.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7f210a205882bf4151ab8bec8c9b3a3fc328a280",
"version": "1.0.0.28",
"port-version": 1
},
{
"git-tree": "06a8f301505eb69082e8654f0c01d724b2e403e0",
"version": "1.0.0.28",