Prepare use of CMAKE_CXX_MODULE_STD

Author: ClausKlein

CMakeLists.txt

@@ -1,6 +1,14 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+# TODO(CK): set(CMAKE_CXX_MODULE_STD 1)
+if(CMAKE_CXX_MODULE_STD)
+    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
+        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
+    )
+    set(CMAKE_CXX_STANDARD 26)
+    set(CMAKE_CXX_STANDARD_REQUIRED OFF)
+endif()
 
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 3.25...4.0)
 
 project(
     beman.scope
@@ -33,6 +41,7 @@ option(
 
 add_library(beman.scope)
 add_library(beman::scope ALIAS beman.scope)
+target_compile_features(beman.scope PRIVATE cxx_std_23)
 
 # gersemi: off
 

tests/CMakeLists.txt

@@ -6,6 +6,8 @@ FetchContent_Declare(
     Catch2
     GIT_REPOSITORY https://github.com/catchorg/Catch2.git
     GIT_TAG v3.8.0
+    SYSTEM
+    # MABY: FIND_PACKAGE_ARGS 3.8.0
 )
 FetchContent_MakeAvailable(Catch2)
 
@@ -17,8 +19,11 @@ include(Catch)
 
 add_executable(test.module)
 target_sources(test.module PRIVATE module.test.cpp)
-target_compile_features(test.module PRIVATE cxx_std_20)
-target_compile_options(test.module PRIVATE "-fmodules")
+target_compile_features(test.module PRIVATE cxx_std_23)
+add_test(NAME test.module COMMAND test.module)
+target_link_libraries(test.module PRIVATE beman::scope)
+
+# XXX target_compile_options(test.module PRIVATE "-fmodules")
 # target_link_libraries(
 #     test.module
 #     PUBLIC FILE_SET TYPE CXX_MODULES include/beman/scope/beman.scope.cppm

tests/module.test.cpp

@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+// TODO(CK): import std;
+
 import beman.scope;
 // #include <stdexcept>
 // #include <string>
+// FIXME: #include <print>
 #include <cassert>
 
 // #define CATCH_CONFIG_MAIN
@@ -13,15 +16,16 @@ import beman.scope;
 //     noisy_resource()  { std::print( "construct noisy\n" ); }
 //     ~noisy_resource() { std::print( "destroy noisy\n"   ); }
 // };
+// clang-format on
 
-//TEST_CASE("module-test", "[scope_module_test]") {
-int main()
-{
+// TEST_CASE("module-test", "[scope_module_test]") {
+int main() {
     bool exit_ran, success_ran, fail_ran = false;
     {
-        beman::scope::scope_exit    _([&exit_ran]    { exit_ran = true;    });
+        beman::scope::scope_exit    _([&exit_ran] { exit_ran = true; });
         beman::scope::scope_success _([&success_ran] { success_ran = true; });
-        beman::scope::scope_fail    _([&fail_ran]    { fail_ran = true;    });
+        beman::scope::scope_fail    _([&fail_ran] { fail_ran = true; });
+        // FIXME:
         // auto                        resource_ptr = beman::scope::unique_resource(new noisy_resource(),
         //                                                   // Cleanup function
         //                                                   [](noisy_resource* ptr) { delete ptr; });
@@ -30,5 +34,4 @@ int main()
     assert(exit_ran == true);
     assert(success_ran == true);
     assert(fail_ran == false);
-
- }
+}