diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | nihil.util/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | nihil.util/nihil.util.ccm | 1 | ||||
| -rw-r--r-- | nihil.util/uuid.ccm (renamed from nihil.uuid/uuid.ccm) | 2 | ||||
| -rw-r--r-- | nihil.util/uuid.test.cc (renamed from nihil.uuid/test.cc) | 2 | ||||
| -rw-r--r-- | nihil.uuid/CMakeLists.txt | 22 |
6 files changed, 11 insertions, 26 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d417178..da623af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,6 @@ add_subdirectory(nihil.generator) add_subdirectory(nihil.match) add_subdirectory(nihil.posix) add_subdirectory(nihil.util) -add_subdirectory(nihil.uuid) if(NIHIL_UCL) add_subdirectory(nihil.ucl) diff --git a/nihil.util/CMakeLists.txt b/nihil.util/CMakeLists.txt index 4c832c8..486a082 100644 --- a/nihil.util/CMakeLists.txt +++ b/nihil.util/CMakeLists.txt @@ -1,11 +1,13 @@ # This source code is released into the public domain. add_library(nihil.util STATIC) + target_link_libraries(nihil.util PRIVATE nihil.std nihil.core nihil.error ) + target_sources(nihil.util PUBLIC FILE_SET modules TYPE CXX_MODULES FILES nihil.util.ccm @@ -21,6 +23,7 @@ target_sources(nihil.util save_errno.ccm skipws.ccm tabulate.ccm + uuid.ccm ) if(NIHIL_TESTS) @@ -36,9 +39,13 @@ if(NIHIL_TESTS) next_word.test.cc skipws.test.cc tabulate.test.cc + uuid.test.cc ) + target_link_libraries(nihil.util.test PRIVATE - nihil.std nihil.util + nihil.std + nihil.core + nihil.util Catch2::Catch2WithMain ) diff --git a/nihil.util/nihil.util.ccm b/nihil.util/nihil.util.ccm index de88f8c..9e4795b 100644 --- a/nihil.util/nihil.util.ccm +++ b/nihil.util/nihil.util.ccm @@ -12,3 +12,4 @@ export import :next_word; export import :save_errno; export import :skipws; export import :tabulate; +export import :uuid; diff --git a/nihil.uuid/uuid.ccm b/nihil.util/uuid.ccm index a7a4770..7b5727c 100644 --- a/nihil.uuid/uuid.ccm +++ b/nihil.util/uuid.ccm @@ -20,7 +20,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. -export module nihil.uuid; +export module nihil.util:uuid; import nihil.std; diff --git a/nihil.uuid/test.cc b/nihil.util/uuid.test.cc index 551c491..eca94d1 100644 --- a/nihil.uuid/test.cc +++ b/nihil.util/uuid.test.cc @@ -25,7 +25,7 @@ #include <catch2/catch_test_macros.hpp> import nihil.std; -import nihil.uuid; +import nihil.util; // NOLINTBEGIN(bugprone-unchecked-optional-access) diff --git a/nihil.uuid/CMakeLists.txt b/nihil.uuid/CMakeLists.txt deleted file mode 100644 index a210322..0000000 --- a/nihil.uuid/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# This source code is released into the public domain. - -add_library(nihil.uuid STATIC) -target_link_libraries(nihil.uuid PRIVATE nihil.std) -target_sources(nihil.uuid - PUBLIC FILE_SET modules TYPE CXX_MODULES FILES - uuid.ccm -) - -if(NIHIL_TESTS) - enable_testing() - - add_executable(nihil.uuid.test test.cc) - target_link_libraries(nihil.uuid.test PRIVATE - nihil.uuid - Catch2::Catch2WithMain - ) - - include(CTest) - include(Catch) - catch_discover_tests(nihil.uuid.test) -endif() |