CMake utility targets for categories

Author: patrickroberts

CMakeLists.txt

@@ -76,7 +76,7 @@ install(
     PATTERN "${CMAKE_CURRENT_BINARY_DIR}/include/beman/any_view/*.hpp"
 )
 
-macro(beman_add_executable)
+function(beman_add_executable)
     set(options)
     set(oneValueArgs CATEGORY TARGET)
     set(multiValueArgs SOURCES LIBRARIES)
@@ -90,13 +90,8 @@ macro(beman_add_executable)
     )
 
     # [CMAKE.TARGET_NAMES]
-    set(target
-        "beman.any_view.${beman_executable_CATEGORY}.${beman_executable_TARGET}"
-    )
-
-    if(NOT beman_executable_SOURCES)
-        set(beman_executable_SOURCES "${beman_executable_TARGET}.cpp")
-    endif()
+    set(category beman.any_view.${beman_executable_CATEGORY})
+    set(target ${category}.${beman_executable_TARGET})
 
     add_executable(${target})
     # [CMAKE.PASSIVE_PROJECTS]
@@ -107,7 +102,13 @@ macro(beman_add_executable)
         ${target}
         PRIVATE beman::any_view ${beman_executable_LIBRARIES}
     )
-endmacro()
+
+    if(NOT TARGET ${category})
+        add_custom_target(${category})
+    endif()
+
+    add_dependencies(${category} ${target})
+endfunction()
 
 if(BEMAN_ANY_VIEW_BUILD_TESTS)
     enable_testing()

tests/beman/any_view/CMakeLists.txt

@@ -20,19 +20,47 @@ FetchContent_MakeAvailable(benchmark googletest)
 
 include(GoogleTest)
 
-function(beman_add_benchmark)
-    beman_add_executable(${ARGN} CATEGORY benchmarks LIBRARIES benchmark::benchmark)
+function(beman_add_benchmark name)
+    beman_add_executable(
+        TARGET ${name}
+        SOURCES ${name}.benchmark.cpp ${ARGN}
+        CATEGORY benchmarks
+        LIBRARIES benchmark::benchmark
+    )
 endfunction()
 
-function(beman_add_test)
-    beman_add_executable(${ARGN} CATEGORY tests LIBRARIES GTest::gtest GTest::gtest_main)
-    gtest_discover_tests(${target})
+function(beman_add_tests)
+    foreach(name ${ARGN})
+        beman_add_executable(
+            TARGET ${name}
+            SOURCES ${name}.test.cpp
+            CATEGORY tests
+            LIBRARIES GTest::gtest GTest::gtest_main
+        )
+        gtest_discover_tests(beman.any_view.tests.${name})
+    endforeach()
 endfunction()
 
-beman_add_benchmark(TARGET all SOURCES all.benchmark.cpp detail/eager.cpp detail/fused.cpp detail/lazy.cpp detail/products.cpp detail/reserved.cpp)
-beman_add_benchmark(TARGET take SOURCES take.benchmark.cpp detail/eager.cpp detail/fused.cpp detail/lazy.cpp detail/products.cpp detail/reserved.cpp)
+beman_add_benchmark(
+    all
+    detail/eager.cpp
+    detail/fused.cpp
+    detail/lazy.cpp
+    detail/products.cpp
+    detail/reserved.cpp
+)
+beman_add_benchmark(
+    take
+    detail/eager.cpp
+    detail/fused.cpp
+    detail/lazy.cpp
+    detail/products.cpp
+    detail/reserved.cpp
+)
 
-beman_add_test(TARGET concepts SOURCES concepts.test.cpp)
-beman_add_test(TARGET constexpr SOURCES constexpr.test.cpp)
-beman_add_test(TARGET sfinae SOURCES sfinae.test.cpp)
-beman_add_test(TARGET type_traits SOURCES type_traits.test.cpp)
+beman_add_tests(
+    concepts
+    constexpr
+    sfinae
+    type_traits
+)