]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | From 5bd18b68658c2ba66e358341c159b17d9ba18791 Mon Sep 17 00:00:00 2001 |
2 | From: Mikhail Paulyshka <me@mixaill.tk> | |
3 | Date: Wed, 15 Mar 2017 00:01:24 +0300 | |
4 | Subject: [PATCH] fix cmake | |
5 | ||
6 | - enable shared lib | |
7 | - add install target | |
8 | - set _CRT_SECURE_NO_WARNINGS | |
9 | --- | |
10 | CMakeLists.txt | 29 +++++++++++++++++++++++++++-- | |
11 | 1 file changed, 27 insertions(+), 2 deletions(-) | |
12 | ||
13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | |
14 | index bf99829..a7bf021 100644 | |
15 | --- a/CMakeLists.txt | |
16 | +++ b/CMakeLists.txt | |
17 | @@ -5,14 +5,21 @@ | |
18 | ## tree. An additional intellectual property rights grant can be found | |
19 | ## in the file PATENTS. All contributing project authors may | |
20 | ## be found in the AUTHORS file in the root of the source tree. | |
21 | -cmake_minimum_required(VERSION 2.8) | |
22 | +cmake_minimum_required(VERSION 3.4) | |
23 | project(LIBWEBM) | |
24 | + | |
25 | +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) | |
26 | + | |
27 | include("${CMAKE_CURRENT_SOURCE_DIR}/build/msvc_runtime.cmake") | |
28 | ||
29 | set(LIBWEBM_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}") | |
30 | ||
31 | +if(MSVC) | |
32 | + add_definitions(-D_CRT_SECURE_NO_WARNINGS) | |
33 | +endif() | |
34 | + | |
35 | # Libwebm section. | |
36 | -add_library(webm STATIC | |
37 | +add_library(webm | |
38 | "${LIBWEBM_SRC_DIR}/mkvmuxer.cpp" | |
39 | "${LIBWEBM_SRC_DIR}/mkvmuxer.hpp" | |
40 | "${LIBWEBM_SRC_DIR}/mkvmuxertypes.hpp" | |
41 | @@ -62,3 +69,21 @@ add_executable(webm2pes | |
42 | "${LIBWEBM_SRC_DIR}/webm2pes.cc" | |
43 | "${LIBWEBM_SRC_DIR}/webm2pes.h") | |
44 | target_link_libraries(webm2pes LINK_PUBLIC webm) | |
45 | + | |
46 | +install( | |
47 | + TARGETS webm | |
48 | + RUNTIME DESTINATION bin | |
49 | + ARCHIVE DESTINATION lib | |
50 | + LIBRARY DESTINATION lib) | |
51 | + | |
52 | +install( | |
53 | + FILES | |
54 | + "mkvmuxer.hpp" | |
55 | + "mkvmuxertypes.hpp" | |
56 | + "mkvmuxerutil.hpp" | |
57 | + "mkvparser.hpp" | |
58 | + "mkvreader.hpp" | |
59 | + "mkvwriter.hpp" | |
60 | + "webmids.hpp" | |
61 | + DESTINATION | |
62 | + "include/libwebm") | |
63 | -- | |
64 | 2.11.0.windows.1 | |
65 |