forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[libwebm] Update to 1.0.0.28 (microsoft#21031)
* [libwebm] Update to 1.0.0.28 * add crt linkage option Co-authored-by: Cheney-Wang <[email protected]>
Showing
8 changed files
with
109 additions
and
128 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index a83d23b..0f5ede3 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -8,6 +8,8 @@ | ||
cmake_minimum_required(VERSION 3.2) | ||
project(LIBWEBM CXX) | ||
|
||
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) | ||
+ | ||
include(GNUInstallDirs) | ||
include("${CMAKE_CURRENT_SOURCE_DIR}/build/cxx_flags.cmake") | ||
|
||
@@ -330,6 +332,30 @@ add_library(webm ${libwebm_common_sources} | ||
$<TARGET_OBJECTS:mkvmuxer> | ||
$<TARGET_OBJECTS:mkvparser>) | ||
|
||
+install( | ||
+ TARGETS webm | ||
+ RUNTIME DESTINATION bin | ||
+ ARCHIVE DESTINATION lib | ||
+ LIBRARY DESTINATION lib | ||
+) | ||
+ | ||
+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 | ||
+ DESTINATION | ||
+ "include/libwebm/" | ||
+) | ||
+ | ||
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) | ||
set_target_properties(webm PROPERTIES PREFIX lib) | ||
endif () | ||
|
||
-add_executable(mkvparser_sample ${mkvparser_sample_sources}) | ||
-target_link_libraries(mkvparser_sample LINK_PUBLIC webm) | ||
+if (ENABLE_SAMPLES) | ||
+ add_executable(mkvparser_sample ${mkvparser_sample_sources}) | ||
+ target_link_libraries(mkvparser_sample LINK_PUBLIC webm) | ||
|
||
-add_executable(mkvmuxer_sample ${mkvmuxer_sample_sources} | ||
- $<TARGET_OBJECTS:webvtt_common>) | ||
-target_link_libraries(mkvmuxer_sample LINK_PUBLIC webm) | ||
+ add_executable(mkvmuxer_sample ${mkvmuxer_sample_sources} | ||
+ $<TARGET_OBJECTS:webvtt_common>) | ||
+ target_link_libraries(mkvmuxer_sample LINK_PUBLIC webm) | ||
+endif() | ||
|
||
-add_executable(dumpvtt ${dumpvtt_sources} $<TARGET_OBJECTS:webvtt_common>) | ||
-target_link_libraries(dumpvtt LINK_PUBLIC webm) | ||
+if (ENABLE_TOOLS) | ||
+ add_executable(dumpvtt ${dumpvtt_sources} $<TARGET_OBJECTS:webvtt_common>) | ||
+ target_link_libraries(dumpvtt LINK_PUBLIC webm) | ||
|
||
-add_executable(vttdemux ${vttdemux_sources}) | ||
-target_link_libraries(vttdemux LINK_PUBLIC webm) | ||
+ add_executable(vttdemux ${vttdemux_sources}) | ||
+ target_link_libraries(vttdemux LINK_PUBLIC webm) | ||
+endif() | ||
|
||
if (ENABLE_WEBMINFO) | ||
add_executable(webm_info ${webm_info_sources}) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,16 @@ | ||
{ | ||
"name": "libwebm", | ||
"version-string": "1.0.0.27", | ||
"port-version": 7, | ||
"version": "1.0.0.28", | ||
"description": "WebM File Parser", | ||
"homepage": "https://github.com/webmproject/libwebm" | ||
"homepage": "https://github.com/webmproject/libwebm", | ||
"dependencies": [ | ||
{ | ||
"name": "vcpkg-cmake", | ||
"host": true | ||
}, | ||
{ | ||
"name": "vcpkg-cmake-config", | ||
"host": true | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters