From b9a549b46789a2b28594d02c9dd20fdf85464cf0 Mon Sep 17 00:00:00 2001 From: Vignesh Venkatasubramanian Date: Wed, 25 Feb 2015 14:04:04 -0800 Subject: [PATCH] Fix CMakefile to generate libwebm.a The existing CMakeLists.txt ends up generating a static library with name "liblibwebm.a" rather than "libwebm.a". This patch fixes it. Change-Id: I4dabac5158530714a38045b8af29e75ade0a939e --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e29fa07..1b79f4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/build/msvc_runtime.cmake") set(LIBWEBM_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}") # Libwebm section. -add_library(libwebm STATIC +add_library(webm STATIC "${LIBWEBM_SRC_DIR}/mkvmuxer.cpp" "${LIBWEBM_SRC_DIR}/mkvmuxer.hpp" "${LIBWEBM_SRC_DIR}/mkvmuxertypes.hpp" @@ -31,7 +31,7 @@ include_directories("${LIBWEBM_SRC_DIR}") # Sample section. add_executable(sample "${LIBWEBM_SRC_DIR}/sample.cpp") -target_link_libraries(sample LINK_PUBLIC libwebm) +target_link_libraries(sample LINK_PUBLIC webm) # Sample muxer section. add_executable(sample_muxer @@ -42,11 +42,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 libwebm) +target_link_libraries(sample_muxer LINK_PUBLIC webm) # 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 libwebm) +target_link_libraries(vttdemux LINK_PUBLIC webm)