Skip to content

Commit 131ed59

Browse files
committed
refactor(cmake): align log utils resolution with core module
1 parent b0c83b9 commit 131ed59

1 file changed

Lines changed: 3 additions & 15 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,26 +55,14 @@ file(GLOB_RECURSE LOG_SOURCES CONFIGURE_DEPENDS
5555
)
5656

5757
# Utils dependency
58-
option(VIX_LOG_FETCH_UTILS "Auto-fetch vix::utils if missing" ON)
59-
6058
if (NOT TARGET vix::utils AND NOT TARGET vix_utils)
6159
if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/../utils/CMakeLists.txt")
62-
message(STATUS "[log] Adding utils from sibling: ../utils")
60+
message(STATUS "[log] Adding utils from umbrella: ../utils")
6361
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../utils" "utils")
64-
else()
62+
elseif (VIX_LOG_FETCH_UTILS)
6563
find_package(vix_utils CONFIG QUIET)
6664
find_package(utils CONFIG QUIET)
6765
endif()
68-
69-
if (NOT TARGET vix::utils AND NOT TARGET vix_utils AND VIX_LOG_FETCH_UTILS)
70-
include(FetchContent)
71-
message(STATUS "[log] Fetching vix::utils via FetchContent")
72-
FetchContent_Declare(vix_utils
73-
GIT_REPOSITORY https://github.com/vixcpp/utils.git
74-
GIT_TAG v0.1.0
75-
)
76-
FetchContent_MakeAvailable(vix_utils)
77-
endif()
7866
endif()
7967

8068
set(VIX_UTILS_TARGET "")
@@ -87,7 +75,7 @@ endif()
8775
if (NOT VIX_UTILS_TARGET)
8876
message(FATAL_ERROR
8977
"vix::utils not found.\n"
90-
"Provide ../utils, install/export the utils package, or enable VIX_LOG_FETCH_UTILS."
78+
"Provide ../utils in the umbrella build, or install/export the utils package."
9179
)
9280
endif()
9381

0 commit comments

Comments
 (0)