From c690e2db277466dd5effd9aecc0077124cd56d79 Mon Sep 17 00:00:00 2001 From: nick black Date: Fri, 7 Feb 2020 09:38:04 -0500 Subject: [PATCH] cmake: fix up avutil includes --- CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48a8edc37..28b4501cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,14 +63,14 @@ target_link_libraries(notcurses PRIVATE "${AVCODEC_LIBRARIES}" "${AVFORMAT_LIBRARIES}" - "${AVUTIL_INCLUDE_DIRS}" + "${AVUTIL_LIBRARIES}" "${SWSCALE_LIBRARIES}" ) target_link_directories(notcurses PUBLIC "${AVCODEC_LIBRARY_DIRS}" "${AVFORMAT_LIBRARY_DIRS}" - "${AVUTIL_INCLUDE_DIRS}" + "${AVUTIL_LIBRARY_DIRS}" "${SWSCALE_LIBRARY_DIRS}" ) endif() @@ -362,18 +362,23 @@ target_include_directories(notcurses-view PRIVATE include "${PROJECT_BINARY_DIR}/include" + "${AVCODEC_INCLUDE_DIRS}" + "${AVFORMAT_INCLUDE_DIRS}" "${AVUTIL_INCLUDE_DIRS}" ) target_link_directories(notcurses-view PRIVATE + "${AVCODEC_LIBRARY_DIRS}" + "${AVFORMAT_LIBRARY_DIRS}" "${AVUTIL_LIBRARY_DIRS}" ) target_link_libraries(notcurses-view PRIVATE notcurses notcurses++ PRIVATE - "${AVUTIL_LIBRARIES}" + "${AVCODEC_LIBRARIES}" "${AVFORMAT_LIBRARIES}" + "${AVUTIL_LIBRARIES}" "${SWSCALE_LIBRARIES}" ) target_compile_options(notcurses-view