Rename the top-level unit test target name

Author: Bill-hbrhbr

CMake/ystdlib-cpp-helpers.cmake

@@ -2,7 +2,7 @@
 # NAMESPACE::NAME. Libraries with multiple levels of namespace nesting are currently not supported.
 #
 # If `BUILD_TESTING` is ON, build the unit tests specific to the current library, and link this
-# library against the global unit test target for the entire `ystdlib-cpp`.
+# library against the unified unit test target for the entire `ystdlib-cpp`.
 #
 # @param NAME
 # @param NAMESPACE
@@ -60,13 +60,12 @@ function(cpp_library)
                     ${CMAKE_BINARY_DIR}/testbin
         )
 
-        if(BUILD_GLOBAL_TESTING)
-            target_sources(${GLOBAL_UNIT_TEST_TARGET} PRIVATE ${arg_cpp_lib_TESTS})
-            target_link_libraries(
-                ${GLOBAL_UNIT_TEST_TARGET}
-                PRIVATE
-                    ${arg_cpp_lib_NAMESPACE}::${arg_cpp_lib_NAME}
-            )
-        endif()
+        # Link against unified unit test
+        target_sources(${UNIFIED_UNIT_TEST_TARGET} PRIVATE ${arg_cpp_lib_TESTS})
+        target_link_libraries(
+            ${UNIFIED_UNIT_TEST_TARGET}
+            PRIVATE
+                ${arg_cpp_lib_NAMESPACE}::${arg_cpp_lib_NAME}
+        )
     endif()
 endfunction()

CMakeLists.txt

@@ -12,34 +12,32 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS
 )
 
 option(BUILD_TESTING "If ON, unit tests will be built." ON)
-option(BUILD_GLOBAL_TESTING "If ON, the global unit test will be built." ON)
-
-find_package(Catch2 3.8.0 REQUIRED)
-if(Catch2_FOUND)
-    message(STATUS "Found Catch2 ${Catch2_VERSION}.")
-else()
-    message(FATAL_ERROR "Could not find libraries for Catch2.")
-endif()
 
 # Import CMake helper functions
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/CMake)
-include(ystdlib-cpp-helpers)
 
 if(BUILD_TESTING)
-    # Set up the global unit test target
-    if(BUILD_GLOBAL_TESTING)
-        set(GLOBAL_UNIT_TEST_TARGET "unit-test-all")
-        add_executable(${GLOBAL_UNIT_TEST_TARGET})
-        target_link_libraries(${GLOBAL_UNIT_TEST_TARGET} PRIVATE Catch2::Catch2WithMain)
-        target_compile_features(${GLOBAL_UNIT_TEST_TARGET} PRIVATE cxx_std_20)
-        set_property(
-            TARGET
-                ${GLOBAL_UNIT_TEST_TARGET}
-            PROPERTY
-                RUNTIME_OUTPUT_DIRECTORY
-                    ${CMAKE_BINARY_DIR}/testbin
-        )
+    find_package(Catch2 3.8.0 REQUIRED)
+    if(Catch2_FOUND)
+        message(STATUS "Found Catch2 ${Catch2_VERSION}.")
+    else()
+        message(FATAL_ERROR "Could not find libraries for Catch2.")
     endif()
+
+    # Set up the unified unit test target
+    set(UNIFIED_UNIT_TEST_TARGET "unit-test-all")
+    add_executable(${UNIFIED_UNIT_TEST_TARGET})
+    target_link_libraries(${UNIFIED_UNIT_TEST_TARGET} PRIVATE Catch2::Catch2WithMain)
+    target_compile_features(${UNIFIED_UNIT_TEST_TARGET} PRIVATE cxx_std_20)
+    set_property(
+        TARGET
+            ${UNIFIED_UNIT_TEST_TARGET}
+        PROPERTY
+            RUNTIME_OUTPUT_DIRECTORY
+                ${CMAKE_BINARY_DIR}/testbin
+    )
 endif()
 
+include(ystdlib-cpp-helpers)
+
 add_subdirectory(src/ystdlib)