OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix ffmpeg cmake scripts not working with cmake 3.8

This commit is contained in:
Davis King 2023-03-23 23:44:23 -04:00
parent 4d5db9940f
commit 91dcb04055
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlib/CMakeLists.txt
View File

@ -838,7 +838,7 @@ if (NOT TARGET dlib)
include(cmake_utils/find_ffmpeg.cmake) include(cmake_utils/find_ffmpeg.cmake)
if (FFMPEG_FOUND) if (FFMPEG_FOUND)
list (APPEND dlib_needed_public_includes ${FFMPEG_INCLUDE_DIRS}) list (APPEND dlib_needed_public_includes ${FFMPEG_INCLUDE_DIRS})
list (APPEND dlib_needed_public_libraries ${FFMPEG_LINK_LIBRARIES}) list (APPEND dlib_needed_public_libraries PkgConfig::FFMPEG)
enable_preprocessor_switch(DLIB_USE_FFMPEG) enable_preprocessor_switch(DLIB_USE_FFMPEG)
else() else()
set(DLIB_USE_FFMPEG OFF CACHE BOOL ${DLIB_USE_FFMPEG_STR} FORCE ) set(DLIB_USE_FFMPEG OFF CACHE BOOL ${DLIB_USE_FFMPEG_STR} FORCE )

4
dlib/cmake_utils/find_ffmpeg.cmake
View File

@ -1,3 +1,5 @@
cmake_minimum_required(VERSION 3.8.0)
message(STATUS "Searching for FFMPEG/LIBAV") message(STATUS "Searching for FFMPEG/LIBAV")
find_package(PkgConfig) find_package(PkgConfig)
if (PkgConfig_FOUND) if (PkgConfig_FOUND)
@ -24,4 +26,4 @@ if (PkgConfig_FOUND)
else() else()
message(STATUS "PkgConfig could not be found, FFMPEG won't be available") message(STATUS "PkgConfig could not be found, FFMPEG won't be available")
set(FFMPEG_FOUND 0) set(FFMPEG_FOUND 0)
endif() endif()