From 69e4c127bc02319dd57a636d49ba59ced993ba86 Mon Sep 17 00:00:00 2001 From: yanggs Date: Tue, 11 Feb 2025 13:23:24 +0800 Subject: [PATCH] Fix compile error when config with -DENABLE_SRT=OFF (#4132) --- src/CMakeLists.txt | 15 ++++++++++++--- src/Http/HttpCookieManager.h | 1 - src/Pusher/PusherBase.cpp | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3241d9e0..6601eb99 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -66,9 +66,18 @@ update_cached_list(MK_LINK_LIBRARIES ZLMediaKit::MediaKit) # 未在使用 if(ENABLE_CXX_API) # 保留目录结构 - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ - DESTINATION ${INSTALL_PATH_INCLUDE}/ZLMediaKit - REGEX ".*[.](md|cpp)$" EXCLUDE) + if(ENABLE_SRT) + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ + DESTINATION ${INSTALL_PATH_INCLUDE}/ZLMediaKit + FILES_MATCHING + PATTERN "*.h") + else() + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ + DESTINATION ${INSTALL_PATH_INCLUDE}/ZLMediaKit + FILES_MATCHING + REGEX ".*/Srt.*" EXCLUDE + PATTERN "*.h") + endif() install(TARGETS zlmediakit DESTINATION ${INSTALL_PATH_LIB}) endif () diff --git a/src/Http/HttpCookieManager.h b/src/Http/HttpCookieManager.h index a0e29a4e..e9846198 100644 --- a/src/Http/HttpCookieManager.h +++ b/src/Http/HttpCookieManager.h @@ -128,7 +128,6 @@ public: /* * 获取附加数据 - /* * Get additional data * [AUTO-TRANSLATED:e277d75d] diff --git a/src/Pusher/PusherBase.cpp b/src/Pusher/PusherBase.cpp index 831f62df..47e6b8d1 100644 --- a/src/Pusher/PusherBase.cpp +++ b/src/Pusher/PusherBase.cpp @@ -37,12 +37,14 @@ static bool checkMediaSourceAndUrlMatch(const MediaSource::Ptr &src, const std:: } } +#ifdef ENABLE_SRT if (strcasecmp("srt", prefix.data()) == 0) { auto ts_src = std::dynamic_pointer_cast(src); if (!ts_src) { return false; } } +#endif // ENABLE_SRT return true; }