From 4f72d335427803dc2abca37a4e34be0cb3b7dbad Mon Sep 17 00:00:00 2001 From: lifegpc Date: Tue, 10 May 2022 13:35:53 +0800 Subject: [PATCH] Update cmake module --- cmake/FindAVCODEC.cmake | 8 ++++++++ cmake/FindAVFORMAT.cmake | 8 ++++++++ cmake/FindAVUTIL.cmake | 8 ++++++++ cmake/FindSWSCALE.cmake | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/cmake/FindAVCODEC.cmake b/cmake/FindAVCODEC.cmake index ff66ab4..0fba324 100644 --- a/cmake/FindAVCODEC.cmake +++ b/cmake/FindAVCODEC.cmake @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.11) find_package(PkgConfig) if (PkgConfig_FOUND) pkg_check_modules(PC_AVCODEC QUIET IMPORTED_TARGET GLOBAL libavcodec) @@ -13,6 +14,12 @@ if (PC_AVCODEC_FOUND) else() set(AVCODEC_INCLUDE_DIRS ${PC_AVCODEC_INCLUDE_DIRS}) endif() + if (NOT AVCODEC_INCLUDE_DIRS) + find_path(AVCODEC_INCLUDE_DIRS NAMES libavcodec/avcodec.h) + if (AVCODEC_INCLUDE_DIRS) + target_include_directories(PkgConfig::PC_AVCODEC INTERFACE ${AVCODEC_INCLUDE_DIRS}) + endif() + endif() if (NOT TARGET AVCODEC::AVCODEC) add_library(AVCODEC::AVCODEC ALIAS PkgConfig::PC_AVCODEC) endif() @@ -25,5 +32,6 @@ find_package_handle_standard_args(AVCODEC FOUND_VAR AVCODEC_FOUND REQUIRED_VARS AVCODEC_LIBRARYS + AVCODEC_INCLUDE_DIRS VERSION_VAR AVCODEC_VERSION ) diff --git a/cmake/FindAVFORMAT.cmake b/cmake/FindAVFORMAT.cmake index c3f39d1..cede37f 100644 --- a/cmake/FindAVFORMAT.cmake +++ b/cmake/FindAVFORMAT.cmake @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.11) find_package(PkgConfig) if (PkgConfig_FOUND) pkg_check_modules(PC_AVFORMAT QUIET IMPORTED_TARGET GLOBAL libavformat) @@ -13,6 +14,12 @@ if (PC_AVFORMAT_FOUND) else() set(AVFORMAT_INCLUDE_DIRS ${PC_AVFORMAT_INCLUDE_DIRS}) endif() + if (NOT AVFORMAT_INCLUDE_DIRS) + find_path(AVFORMAT_INCLUDE_DIRS NAMES libavformat/avformat.h) + if (AVFORMAT_INCLUDE_DIRS) + target_link_directories(PkgConfig::PC_AVFORMAT INTERFACE ${AVFORMAT_INCLUDE_DIRS}) + endif() + endif() if (NOT TARGET AVFORMAT::AVFORMAT) add_library(AVFORMAT::AVFORMAT ALIAS PkgConfig::PC_AVFORMAT) endif() @@ -25,5 +32,6 @@ find_package_handle_standard_args(AVFORMAT FOUND_VAR AVFORMAT_FOUND REQUIRED_VARS AVFORMAT_LIBRARYS + AVFORMAT_INCLUDE_DIRS VERSION_VAR AVFORMAT_VERSION ) diff --git a/cmake/FindAVUTIL.cmake b/cmake/FindAVUTIL.cmake index d2d5363..03a8254 100644 --- a/cmake/FindAVUTIL.cmake +++ b/cmake/FindAVUTIL.cmake @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.11) find_package(PkgConfig) if (PkgConfig_FOUND) pkg_check_modules(PC_AVUTIL QUIET IMPORTED_TARGET GLOBAL libavutil) @@ -13,6 +14,12 @@ if (PC_AVUTIL_FOUND) else() set(AVUTIL_INCLUDE_DIRS ${PC_AVUTIL_INCLUDE_DIRS}) endif() + if (NOT AVUTIL_INCLUDE_DIRS) + find_path(AVUTIL_INCLUDE_DIRS NAMES libavutil/avutil.h) + if (AVUTIL_INCLUDE_DIRS) + target_include_directories(PkgConfig::PC_AVUTIL INTERFACE ${AVUTIL_INCLUDE_DIRS}) + endif() + endif() if (NOT TARGET AVUTIL::AVUTIL) add_library(AVUTIL::AVUTIL ALIAS PkgConfig::PC_AVUTIL) endif() @@ -25,5 +32,6 @@ find_package_handle_standard_args(AVUTIL FOUND_VAR AVUTIL_FOUND REQUIRED_VARS AVUTIL_LIBRARYS + AVUTIL_INCLUDE_DIRS VERSION_VAR AVUTIL_VERSION ) diff --git a/cmake/FindSWSCALE.cmake b/cmake/FindSWSCALE.cmake index b5634c3..b67aeef 100644 --- a/cmake/FindSWSCALE.cmake +++ b/cmake/FindSWSCALE.cmake @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.11) find_package(PkgConfig) if (PkgConfig_FOUND) pkg_check_modules(PC_SWSCALE QUIET IMPORTED_TARGET GLOBAL libswscale) @@ -13,6 +14,12 @@ if (PC_SWSCALE_FOUND) else() set(SWSCALE_INCLUDE_DIRS ${PC_SWSCALE_INCLUDE_DIRS}) endif() + if (NOT SWSCALE_INCLUDE_DIRS) + find_path(SWSCALE_INCLUDE_DIRS NAMES libswscale/swscale.h) + if (SWSCALE_INCLUDE_DIRS) + target_include_directories(PkgConfig::PC_SWSCALE INTERFACE ${SWSCALE_INCLUDE_DIRS}) + endif() + endif() if (NOT TARGET SWSCALE::SWSCALE) add_library(SWSCALE::SWSCALE ALIAS PkgConfig::PC_SWSCALE) endif() @@ -25,5 +32,6 @@ find_package_handle_standard_args(SWSCALE FOUND_VAR SWSCALE_FOUND REQUIRED_VARS SWSCALE_LIBRARYS + SWSCALE_INCLUDE_DIRS VERSION_VAR SWSCALE_VERSION )