From 908c8b5a3674e8ed738cd05ea521fe8d65b23cfe Mon Sep 17 00:00:00 2001 From: wyc <1104749580@qq.com> Date: Wed, 22 Jul 2026 10:19:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=20build=5Finfra?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 4 ++-- main.cmake | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8720aed..0a9ea11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_LIST_DIR}) include(third_party/build_infra/start.cmake) include(third_party/CPP_Core/main.cmake) include(third_party/SSR/main.cmake) - set(ecap_rely drogon libarchive SQLiteCpp) - library_is_installed_with_rely(global ok ${ecap_rely}) + set(ecap_rely global::drogon global::libarchive global::SQLiteCpp) + library_is_installed_with_rely(ok ${ecap_rely}) if (${ok}) include(${CMAKE_SOURCE_DIR}/main.cmake) else () diff --git a/main.cmake b/main.cmake index 5d0059c..5a141d8 100644 --- a/main.cmake +++ b/main.cmake @@ -1,6 +1,6 @@ get_filename_component(name ${CMAKE_CURRENT_LIST_DIR} NAME) -set(rely libarchive SQLiteCpp) -rcl_load_dependency_environment(drogon ${rely}) +set(rely global::drogon global::libarchive global::SQLiteCpp) +rcl_load_dependency_environment(${rely}) #message("222222222 LibArchive_SUB_LIBRARIES {${LibArchive_SUB_LIBRARIES}}") @@ -137,7 +137,7 @@ if (1) _attach_source_dir(test_drogon "${md}/test_drogon") target_link_libraries(test_drogon PRIVATE Drogon::Drogon) endif () -rcl_unload_dependency_environment(drogon ${rely}) +rcl_unload_dependency_environment(${rely}) #include("${CMAKE_SOURCE_DIR}/0_cmake_library/ninja_build_analyze/export.cmake") # #register_ninja_build_analyze_target(