generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set library name to match Windows expectations.

Browse Source 
Back to libwebm.lib from webm.lib.

Change-Id: I6ced362c987a7b5d3d56365a1ed53de7bf9f849b
This commit is contained in:
Tom Finegan 2015-02-25 15:37:05 -08:00
parent b9a549b467
commit feeb9b13ff
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -11,8 +11,13 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/build/msvc_runtime.cmake")
set(LIBWEBM_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
set(LIBWEBM_LIBRARY_NAME "webm")
if(WIN32)
set(LIBWEBM_LIBRARY_NAME "libwebm")
endif(WIN32)
# Libwebm section.
add_library(webm STATIC
add_library("${LIBWEBM_LIBRARY_NAME}" STATIC
"${LIBWEBM_SRC_DIR}/mkvmuxer.cpp"
"${LIBWEBM_SRC_DIR}/mkvmuxer.hpp"
"${LIBWEBM_SRC_DIR}/mkvmuxertypes.hpp"
@ -31,7 +36,7 @@ include_directories("${LIBWEBM_SRC_DIR}")
# Sample section.
add_executable(sample
"${LIBWEBM_SRC_DIR}/sample.cpp")
target_link_libraries(sample LINK_PUBLIC webm)
target_link_libraries(sample LINK_PUBLIC "${LIBWEBM_LIBRARY_NAME}")
# Sample muxer section.
add_executable(sample_muxer
@ -42,11 +47,11 @@ add_executable(sample_muxer
"${LIBWEBM_SRC_DIR}/vttreader.h"
"${LIBWEBM_SRC_DIR}/webvttparser.cc"
"${LIBWEBM_SRC_DIR}/webvttparser.h")
target_link_libraries(sample_muxer LINK_PUBLIC webm)
target_link_libraries(sample_muxer LINK_PUBLIC "${LIBWEBM_LIBRARY_NAME}")
# Vttdemux section.
add_executable(vttdemux
"${LIBWEBM_SRC_DIR}/vttdemux.cc"
"${LIBWEBM_SRC_DIR}/webvttparser.cc"
"${LIBWEBM_SRC_DIR}/webvttparser.h")
target_link_libraries(vttdemux LINK_PUBLIC webm)
target_link_libraries(vttdemux LINK_PUBLIC "${LIBWEBM_LIBRARY_NAME}")