From 5adeb648f74c1771164c0686d6e0fc584cf36d9e Mon Sep 17 00:00:00 2001 From: Lexi Winter Date: Wed, 2 Jul 2025 04:00:06 +0100 Subject: move everything from util to core --- nihil.cli/CMakeLists.txt | 6 +++++- nihil.cli/command_tree.ccm | 3 ++- nihil.cli/dispatch_command.test.cc | 2 +- nihil.cli/usage_error.ccm | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) (limited to 'nihil.cli') diff --git a/nihil.cli/CMakeLists.txt b/nihil.cli/CMakeLists.txt index 22fc1de..e87d3d4 100644 --- a/nihil.cli/CMakeLists.txt +++ b/nihil.cli/CMakeLists.txt @@ -1,12 +1,14 @@ # This source code is released into the public domain. add_library(nihil.cli STATIC) + target_link_libraries(nihil.cli PRIVATE nihil.std + nihil.core nihil.generator nihil.posix - nihil.util ) + target_sources(nihil.cli PUBLIC FILE_SET modules TYPE CXX_MODULES FILES nihil.cli.ccm @@ -29,8 +31,10 @@ if(NIHIL_TESTS) command_tree.test.cc dispatch_command.test.cc ) + target_link_libraries(nihil.cli.test PRIVATE nihil.std + nihil.core nihil.cli Catch2::Catch2WithMain ) diff --git a/nihil.cli/command_tree.ccm b/nihil.cli/command_tree.ccm index 8ed16c7..844b2cf 100644 --- a/nihil.cli/command_tree.ccm +++ b/nihil.cli/command_tree.ccm @@ -3,7 +3,8 @@ export module nihil.cli:command_tree; import nihil.std; import nihil.generator; -import nihil.util; +import nihil.core; + import :command; import :registry; diff --git a/nihil.cli/dispatch_command.test.cc b/nihil.cli/dispatch_command.test.cc index 8253bdc..a74fa36 100644 --- a/nihil.cli/dispatch_command.test.cc +++ b/nihil.cli/dispatch_command.test.cc @@ -6,7 +6,7 @@ import nihil.std; import nihil.cli; -import nihil.util; +import nihil.core; namespace { diff --git a/nihil.cli/usage_error.ccm b/nihil.cli/usage_error.ccm index 8502755..497af89 100644 --- a/nihil.cli/usage_error.ccm +++ b/nihil.cli/usage_error.ccm @@ -2,7 +2,7 @@ export module nihil.cli:usage_error; import nihil.std; -import nihil.util; +import nihil.core; namespace nihil { -- cgit v1.2.3