From e8d402db5107e23f4e68d1f02095f018a56f97f5 Mon Sep 17 00:00:00 2001
From: linbo <1034003879@qq.com>
Date: Thu, 27 Aug 2026 10:46:22 +0800
Subject: [PATCH] fix(cmake): build legacy and safety media managers

---
 cmvr-es/CMakeLists.txt                                 |  1 +
 cmvr-es/manager/media_source_hub/CMakeLists.txt        | 10 +++++-----
 .../include/device_media_source_adapter.h              |  3 ---
 .../src/device_media_source_adapter.cpp                |  4 ++--
 cmvr-es/service/quic_edge/CMakeLists.txt               |  2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/cmvr-es/CMakeLists.txt b/cmvr-es/CMakeLists.txt
index 1d6f8080..ad988823 100644
--- a/cmvr-es/CMakeLists.txt
+++ b/cmvr-es/CMakeLists.txt
@@ -10,6 +10,7 @@ add_subdirectory(manager/control_authority_manager)
 add_subdirectory(manager/safety_manager)
 add_subdirectory(manager/device_manager)
 add_subdirectory(service/grpc/stop_all)
+add_subdirectory(manager/media_source_hub)
 add_subdirectory(manager/media_source_manager)
 add_subdirectory(service/quic_edge)
 add_subdirectory(task)
diff --git a/cmvr-es/manager/media_source_hub/CMakeLists.txt b/cmvr-es/manager/media_source_hub/CMakeLists.txt
index 6a3634fd..c6220d16 100644
--- a/cmvr-es/manager/media_source_hub/CMakeLists.txt
+++ b/cmvr-es/manager/media_source_hub/CMakeLists.txt
@@ -17,22 +17,22 @@ target_include_directories(media_source_hub
 add_library(cmvr_es::media_source_hub ALIAS media_source_hub)
 
 if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-    add_library(device_media_source_adapter STATIC
+    add_library(media_source_hub_device_adapter STATIC
             src/device_media_source_adapter.cpp
     )
-    target_compile_features(device_media_source_adapter PUBLIC cxx_std_17)
-    target_include_directories(device_media_source_adapter
+    target_compile_features(media_source_hub_device_adapter PUBLIC cxx_std_17)
+    target_include_directories(media_source_hub_device_adapter
             PUBLIC
             ${CMAKE_CURRENT_SOURCE_DIR}/../..
     )
-    target_link_libraries(device_media_source_adapter
+    target_link_libraries(media_source_hub_device_adapter
             PUBLIC
             cmvr_es::media_source_hub
             cmvr_es::common
             cmvr_es::proto
             cmvr_es::logging
     )
-    add_library(cmvr_es::device_media_source_adapter ALIAS device_media_source_adapter)
+    add_library(cmvr_es::media_source_hub_device_adapter ALIAS media_source_hub_device_adapter)
 endif()
 
 option(CMVR_MEDIA_SOURCE_HUB_BUILD_TESTS
diff --git a/cmvr-es/manager/media_source_hub/include/device_media_source_adapter.h b/cmvr-es/manager/media_source_hub/include/device_media_source_adapter.h
index 728e2d85..f1b87205 100644
--- a/cmvr-es/manager/media_source_hub/include/device_media_source_adapter.h
+++ b/cmvr-es/manager/media_source_hub/include/device_media_source_adapter.h
@@ -16,9 +16,6 @@ namespace cmvr::media {
 // Process-wide protocol-neutral media hub shared by gRPC and QUIC services.
 MediaSourceHub& globalMediaSourceHub();
 
-std::string cameraColorTrackId(const std::string& device_id);
-std::string microphoneTrackId(const std::string& device_id);
-
 // Registration is idempotent for an already registered track. The adapter owns a
 // short-lived pump thread and one startStreaming()/stopStreaming() lease only while
 // at least one Hub subscription is active. It ensures start() succeeds but deliberately
diff --git a/cmvr-es/manager/media_source_hub/src/device_media_source_adapter.cpp b/cmvr-es/manager/media_source_hub/src/device_media_source_adapter.cpp
index de6f1338..d974a1ac 100644
--- a/cmvr-es/manager/media_source_hub/src/device_media_source_adapter.cpp
+++ b/cmvr-es/manager/media_source_hub/src/device_media_source_adapter.cpp
@@ -613,11 +613,11 @@ MediaSourceHub& globalMediaSourceHub() {
     return hub;
 }
 
-std::string cameraColorTrackId(const std::string& device_id) {
+static std::string cameraColorTrackId(const std::string& device_id) {
     return device_id + "/video/color";
 }
 
-std::string microphoneTrackId(const std::string& device_id) {
+static std::string microphoneTrackId(const std::string& device_id) {
     return device_id + "/audio/main";
 }
 
diff --git a/cmvr-es/service/quic_edge/CMakeLists.txt b/cmvr-es/service/quic_edge/CMakeLists.txt
index 6d349e99..ef76c3e8 100644
--- a/cmvr-es/service/quic_edge/CMakeLists.txt
+++ b/cmvr-es/service/quic_edge/CMakeLists.txt
@@ -16,7 +16,7 @@ target_link_libraries(quic_edge_service
         cmvr_es::proto
         cmvr_es::media_source_hub
         PRIVATE
-        cmvr_es::device_media_source_adapter
+        cmvr_es::media_source_hub_device_adapter
         cmvr_es::device_manager
         Threads::Threads
         msquic