Merge pull request #3 from bemanproject/2-updates-for-cmake-and-project-structure

Updates for cmake and project structure to header only. Remove the src tree. Simplify the naming in examples.  Require C++20 ranges in the header -- provide a user error on failure.

Author: JeffGarland

.github/workflows/cookiecutter_test.yml

@@ -1,15 +1,16 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 3.28...4.2)
 
 project(
-    beman.take_before # CMake Project Name, which is also the name of the top-level
-    # targets (e.g., library, executable, etc.).
-    DESCRIPTION "A Beman Library for take_before"
+    beman.take_before
+    DESCRIPTION "take_before_view"
     LANGUAGES CXX
-    VERSION 2.2.1
+    VERSION 0.0.1
 )
 
+# gersemi: off
+
 # [CMAKE.SKIP_TESTS]
 option(
     BEMAN_TAKE_BEFORE_BUILD_TESTS
@@ -24,12 +25,28 @@ option(
     ${PROJECT_IS_TOP_LEVEL}
 )
 
-include(CTest)
 
-add_subdirectory(src/beman/take_before)
+add_library(beman.take_before INTERFACE)
+target_sources(
+           beman.take_before
+               INTERFACE
+                 FILE_SET HEADERS
+                 BASE_DIRS include
+                 FILES include/beman/take_before/take_before.hpp
+    )
+
+add_library(beman::take_before ALIAS beman.take_before)
+set_target_properties(beman.take_before PROPERTIES VERIFY_INTERFACE_HEADER_SETS ON)
+
+set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/infra/cmake)
+
+
+find_package(beman-install-library REQUIRED)
+beman_install_library(beman.take_before)
 
 if(BEMAN_TAKE_BEFORE_BUILD_TESTS)
-    add_subdirectory(tests/beman/take_before)
+  enable_testing()
+  add_subdirectory(tests/beman/take_before)
 endif()
 
 if(BEMAN_TAKE_BEFORE_BUILD_EXAMPLES)

CMakeLists.txt

@@ -1,27 +1,16 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-set(ALL_EXAMPLES take_before_direct_usage)
-
-# Example `take_before_as_default_projection` need ranges support:
-include(CheckCXXSymbolExists)
-check_cxx_symbol_exists(__cpp_lib_ranges "ranges" HAS_RANGES)
+# gersemi: off
 
-if(HAS_RANGES)
-    list(APPEND ALL_EXAMPLES take_before_as_default_projection)
-else()
-    message(
-        WARNING
-        "Missing range support! Skip: take_before_as_default_projection"
-    )
-endif()
+set(ALL_EXAMPLES take_before_direct_usage)
 
 message("Examples to be built: ${ALL_EXAMPLES}")
 
 foreach(example ${ALL_EXAMPLES})
-    add_executable(beman.take_before.examples.${example})
-    target_sources(beman.take_before.examples.${example} PRIVATE ${example}.cpp)
+    add_executable(${example})
+    target_sources(${example} PRIVATE ${example}.cpp)
     target_link_libraries(
-        beman.take_before.examples.${example}
+        ${example}
         PRIVATE beman::take_before
     )
 endforeach()

…before/beman.take_before-config.cmake.in beman.take_before-config.cmake.insrc/beman/take_before/beman.take_before-config.cmake.in renamed to beman.take_before-config.cmake.in src/beman/take_before/beman.take_before-config.cmake.in renamed to beman.take_before-config.cmake.in

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
 #include <beman/take_before/take_before.hpp>
 
 #include <iostream>

examples/CMakeLists.txt

@@ -11,6 +11,12 @@
 #include <type_traits>
 #include <utility>
 
+// clang-format off
+#if __cpp_concepts > 202002L
+   #error "C++20 concepts is required"
+#endif
+// clang-format on
+
 namespace beman::take_before {
 
 // ============================================================================

examples/take_before_direct_usage.cpp

@@ -1,13 +1,13 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-find_package(GTest REQUIRED)
+find_package(GTest QUIET)
 
-add_executable(beman.take_before.tests.take_before)
-target_sources(beman.take_before.tests.take_before PRIVATE take_before.test.cpp)
+add_executable(beman_take_before.test)
+target_sources(beman_take_before.test PRIVATE take_before.test.cpp)
 target_link_libraries(
-    beman.take_before.tests.take_before
+    beman_take_before.test
     PRIVATE beman::take_before GTest::gtest GTest::gtest_main
 )
 
 include(GoogleTest)
-gtest_discover_tests(beman.take_before.tests.take_before)
+gtest_discover_tests(beman_take_before.test)

include/beman/take_before/take_before.hpp

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
 #include <beman/take_before/take_before.hpp>
 
 #include <gtest/gtest.h>