Fix up minimal dependency case and clang support.
This commit is contained in:
parent
925f0c3ccd
commit
1adc9272f8
17 changed files with 183 additions and 226 deletions
|
@ -13,7 +13,7 @@ list(APPEND video_LIB_INCLUDES
|
|||
|
||||
list(APPEND video_DEFINES "")
|
||||
|
||||
message(STATUS "Checking optional dependencies for module: " ${MODULE_NAME})
|
||||
message(STATUS "Checking dependencies for module: " ${MODULE_NAME})
|
||||
find_package(PkgConfig QUIET)
|
||||
set(_HAS_FFMPEG Off)
|
||||
if(PkgConfig_FOUND)
|
||||
|
@ -38,17 +38,15 @@ if(PkgConfig_FOUND)
|
|||
list(APPEND video_DEFINES "HAS_FFMPEG")
|
||||
set(_HAS_FFMPEG ON)
|
||||
else()
|
||||
message(STATUS "libavdevice not found - disabling ffmpeg support")
|
||||
message(STATUS "ffmpeg not found - skipping support")
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "PkgConfig not found - disabling ffmpeg support")
|
||||
message(STATUS "ffmpeg not found - skipping support")
|
||||
endif()
|
||||
|
||||
set(HAS_FFMPEG ${_HAS_FFMPEG} CACHE BOOL "Can build with FFMPEG")
|
||||
|
||||
add_library(${MODULE_NAME} SHARED ${video_LIB_INCLUDES} ${video_HEADERS})
|
||||
|
||||
target_include_directories(video PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
target_include_directories(${MODULE_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
set_target_properties( video PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
|
||||
|
||||
list(APPEND video_LIBS image)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue