58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
|
From 339ebc5aa634b4680585d7c36317ab6f162ca2a9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dirk Vanden Boer <dirk.vdb@gmail.com>
|
||
|
|
Date: Tue, 7 Jan 2020 13:00:59 +0100
|
||
|
|
Subject: [PATCH] Fixed object target configuration
|
||
|
|
|
||
|
|
---
|
||
|
|
CMakeLists.txt | 23 +++++++++++------------
|
||
|
|
1 file changed, 11 insertions(+), 12 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 671b93a..8616c56 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -92,6 +92,15 @@ add_library(libffmpegthumbnailerobj OBJECT
|
||
|
|
libffmpegthumbnailer/filmstripfilter.cpp
|
||
|
|
)
|
||
|
|
|
||
|
|
+target_link_libraries(libffmpegthumbnailerobj
|
||
|
|
+ FFmpeg::avformat
|
||
|
|
+ FFmpeg::avcodec
|
||
|
|
+ FFmpeg::avutil
|
||
|
|
+ FFmpeg::avfilter
|
||
|
|
+ $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}>
|
||
|
|
+ $<$<BOOL:${HAVE_PNG}>:PNG::PNG>
|
||
|
|
+)
|
||
|
|
+
|
||
|
|
# we use our own deprecated struct menbers, so disable the warning about it
|
||
|
|
set_source_files_properties(libffmpegthumbnailer/videothumbnailerc.cpp PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations)
|
||
|
|
|
||
|
|
@@ -118,12 +127,7 @@ set (FFMPEGTHUMBNAILER_SOVERSION_AGE 1)
|
||
|
|
if (ENABLE_STATIC)
|
||
|
|
add_library(libffmpegthumbnailerstatic STATIC $<TARGET_OBJECTS:libffmpegthumbnailerobj>)
|
||
|
|
target_link_libraries(libffmpegthumbnailerstatic
|
||
|
|
- FFmpeg::avformat
|
||
|
|
- FFmpeg::avcodec
|
||
|
|
- FFmpeg::avutil
|
||
|
|
- FFmpeg::avfilter
|
||
|
|
- $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}>
|
||
|
|
- $<$<BOOL:${HAVE_PNG}>:PNG::PNG>
|
||
|
|
+ libffmpegthumbnailerobj
|
||
|
|
$<$<BOOL:${ENABLE_GIO}>:${CMAKE_DL_LIBS}>
|
||
|
|
)
|
||
|
|
|
||
|
|
@@ -140,12 +144,7 @@ endif ()
|
||
|
|
if (ENABLE_SHARED)
|
||
|
|
add_library(libffmpegthumbnailer SHARED $<TARGET_OBJECTS:libffmpegthumbnailerobj>)
|
||
|
|
target_link_libraries(libffmpegthumbnailer
|
||
|
|
- FFmpeg::avformat
|
||
|
|
- FFmpeg::avcodec
|
||
|
|
- FFmpeg::avutil
|
||
|
|
- FFmpeg::avfilter
|
||
|
|
- $<$<BOOL:${HAVE_JPEG}>:${JPEG_LIBRARIES}>
|
||
|
|
- $<$<BOOL:${HAVE_PNG}>:PNG::PNG>
|
||
|
|
+ libffmpegthumbnailerobj
|
||
|
|
)
|
||
|
|
|
||
|
|
set_target_properties(libffmpegthumbnailer PROPERTIES
|