Merge branch 'master' of github.com:dankamongmen/notcurses

pull/331/head
nick black 5 years ago
commit 07a1904b6c
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC

@ -63,14 +63,14 @@ target_link_libraries(notcurses
PRIVATE PRIVATE
"${AVCODEC_LIBRARIES}" "${AVCODEC_LIBRARIES}"
"${AVFORMAT_LIBRARIES}" "${AVFORMAT_LIBRARIES}"
"${AVUTIL_INCLUDE_DIRS}" "${AVUTIL_LIBRARIES}"
"${SWSCALE_LIBRARIES}" "${SWSCALE_LIBRARIES}"
) )
target_link_directories(notcurses target_link_directories(notcurses
PUBLIC PUBLIC
"${AVCODEC_LIBRARY_DIRS}" "${AVCODEC_LIBRARY_DIRS}"
"${AVFORMAT_LIBRARY_DIRS}" "${AVFORMAT_LIBRARY_DIRS}"
"${AVUTIL_INCLUDE_DIRS}" "${AVUTIL_LIBRARY_DIRS}"
"${SWSCALE_LIBRARY_DIRS}" "${SWSCALE_LIBRARY_DIRS}"
) )
endif() endif()
@ -362,18 +362,23 @@ target_include_directories(notcurses-view
PRIVATE PRIVATE
include include
"${PROJECT_BINARY_DIR}/include" "${PROJECT_BINARY_DIR}/include"
"${AVCODEC_INCLUDE_DIRS}"
"${AVFORMAT_INCLUDE_DIRS}"
"${AVUTIL_INCLUDE_DIRS}" "${AVUTIL_INCLUDE_DIRS}"
) )
target_link_directories(notcurses-view target_link_directories(notcurses-view
PRIVATE PRIVATE
"${AVCODEC_LIBRARY_DIRS}"
"${AVFORMAT_LIBRARY_DIRS}"
"${AVUTIL_LIBRARY_DIRS}" "${AVUTIL_LIBRARY_DIRS}"
) )
target_link_libraries(notcurses-view target_link_libraries(notcurses-view
PRIVATE PRIVATE
notcurses notcurses++ notcurses notcurses++
PRIVATE PRIVATE
"${AVUTIL_LIBRARIES}" "${AVCODEC_LIBRARIES}"
"${AVFORMAT_LIBRARIES}" "${AVFORMAT_LIBRARIES}"
"${AVUTIL_LIBRARIES}"
"${SWSCALE_LIBRARIES}" "${SWSCALE_LIBRARIES}"
) )
target_compile_options(notcurses-view target_compile_options(notcurses-view

Loading…
Cancel
Save