aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2017-02-11 12:56:13 -0800
committerChris Robinson <[email protected]>2017-02-11 12:56:13 -0800
commit6b030999cbde7cbd59752031ed696b7f9dd51969 (patch)
treee267019e4b8f11abfccf0dd2ad33d3a5e00cdb68 /cmake
parente92229f8395979591a14a980543d92aa4e7489c0 (diff)
Don't require SDL_sound for alffplay
Also explicitly link with libz for alffplay, since static ffmpeg libs need it.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/FindFFmpeg.cmake6
1 files changed, 6 insertions, 0 deletions
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
index 96cbb6ed..c489c2c3 100644
--- a/cmake/FindFFmpeg.cmake
+++ b/cmake/FindFFmpeg.cmake
@@ -142,6 +142,12 @@ foreach(_component ${FFmpeg_FIND_COMPONENTS})
endif()
endforeach()
+# Add libz if it exists (needed for static ffmpeg builds)
+find_library(_FFmpeg_HAVE_LIBZ NAMES z)
+if(_FFmpeg_HAVE_LIBZ)
+ set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${_FFmpeg_HAVE_LIBZ})
+endif()
+
# Build the include path and library list with duplicates removed.
if(FFMPEG_INCLUDE_DIRS)
list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)