bemanproject · dietmarkuehl · Jan 30, 2026 · Jan 30, 2026 · Jan 30, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,7 +49,7 @@ if(BEMAN_USE_MODULES)
                 FILES
                     ${CMAKE_CURRENT_BINARY_DIR}/beman/execution/modules_export.hpp
     )
-    target_compile_definitions(beman_execution PUBLIC BEMAN_USE_MODULES)
+    # FIXME: target_compile_definitions(beman_execution PUBLIC BEMAN_HAS_MODULES)
 endif()
 
 if(BEMAN_USE_MODULES AND CMAKE_CXX_MODULE_STD)

diff --git a/cmake/cxx-modules-rules.cmake b/cmake/cxx-modules-rules.cmake
@@ -91,7 +91,7 @@ endif()
 
 option(
     BEMAN_USE_STD_MODULE
-    "Check if 'import std;' is possible with the toolchain"
+    "Check if 'import std;' is possible with the toolchain?"
     OFF
 )
 message(STATUS "BEMAN_USE_STD_MODULE=${BEMAN_USE_STD_MODULE}")
@@ -110,7 +110,7 @@ if(BEMAN_USE_STD_MODULE)
         set(CMAKE_CXX_SCAN_FOR_MODULES ON)
         option(
             BEMAN_HAS_IMPORT_STD
-            "Build with import std; possible"
+            "Build with import std; is possible and used!"
             ${CMAKE_CXX_MODULE_STD}
         )
         message(STATUS "BEMAN_HAS_IMPORT_STD=${BEMAN_HAS_IMPORT_STD}")

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -39,7 +39,8 @@ set(EXAMPLES
 )
 
 if(BEMAN_USE_MODULES)
-    # FIXME: not yet! list(APPEND EXAMPLES modules) # modules.cpp
+    # FIXME: not yet!
+    list(APPEND EXAMPLES modules) # modules.cpp
 endif()
 
 foreach(EXAMPLE ${EXAMPLES})

diff --git a/examples/modules.cpp b/examples/modules.cpp
@@ -1,10 +1,6 @@
 // examples/modules.cpp                                               -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef WIN32
-#undef BEMAN_HAS_IMPORT_STD
-#endif
-
 #ifdef BEMAN_HAS_IMPORT_STD
 import std;
 #else
@@ -18,21 +14,12 @@ import std;
 
 #endif
 
-#if defined(__cpp_modules) && __cpp_modules < 201907L
-
 #ifdef BEMAN_USE_MODULES
-#warning "__cpp_modules seems not usable!"
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
 #endif
 
-#else
-
-import beman.execution;
-
-#endif
-
 namespace ex = beman::execution;
 
 int main() {

diff --git a/tests/beman/execution/CMakeLists.txt b/tests/beman/execution/CMakeLists.txt
@@ -124,7 +124,7 @@ foreach(test ${execution_tests})
     add_test(NAME ${TEST_EXE} COMMAND $<TARGET_FILE:${TEST_EXE}>)
 endforeach()
 
-if(BEMAN_EXECUTION_ENABLE_INSTALL)
+if(BEMAN_EXECUTION_ENABLE_INSTALL AND NOT CMAKE_SKIP_INSTALL_RULES)
     # test if the targets are usable from the install directory
     add_test(
         NAME install-to-stagedir

diff --git a/tests/beman/execution/exec-affine-on.test.cpp b/tests/beman/execution/exec-affine-on.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/exec-affine-on.test.cpp                      -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/affine_on.hpp>

diff --git a/tests/beman/execution/exec-associate.test.cpp b/tests/beman/execution/exec-associate.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/exec-associate.test.cpp                      -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/associate.hpp>

diff --git a/tests/beman/execution/exec-awaitable.test.cpp b/tests/beman/execution/exec-awaitable.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-awaitable.test.cpp                -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/await_suspend_result.hpp>

diff --git a/tests/beman/execution/exec-bulk.test.cpp b/tests/beman/execution/exec-bulk.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-bulk.test.cpp -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include "beman/execution/detail/get_completion_signatures.hpp"

diff --git a/tests/beman/execution/exec-env.test.cpp b/tests/beman/execution/exec-env.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/exec-env.test.cpp                            -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/env.hpp>

diff --git a/tests/beman/execution/exec-fwd-env.test.cpp b/tests/beman/execution/exec-fwd-env.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-fwd-env.test.cpp                  -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>

diff --git a/tests/beman/execution/exec-general.test.cpp b/tests/beman/execution/exec-general.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-general.test.cpp                  -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>

diff --git a/tests/beman/execution/exec-get-compl-sched.test.cpp b/tests/beman/execution/exec-get-compl-sched.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-get-compl-sched.test.cpp          -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/get_completion_scheduler.hpp>

diff --git a/tests/beman/execution/exec-get-delegation-scheduler.test.cpp b/tests/beman/execution/exec-get-delegation-scheduler.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-get-delegation-scheduler.test.cpp -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/get_delegation_scheduler.hpp>

diff --git a/tests/beman/execution/exec-get-domain.test.cpp b/tests/beman/execution/exec-get-domain.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-get-domain.test.cpp               -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>

diff --git a/tests/beman/execution/exec-get-env.test.cpp b/tests/beman/execution/exec-get-env.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-get-env.test.cpp                  -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>

diff --git a/tests/beman/execution/exec-get-scheduler.test.cpp b/tests/beman/execution/exec-get-scheduler.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-get-scheduler.test.cpp            -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/get_scheduler.hpp>

diff --git a/tests/beman/execution/exec-get-stop-token.test.cpp b/tests/beman/execution/exec-get-stop-token.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-get-stop-token.test.cpp           -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>

diff --git a/tests/beman/execution/exec-getcomplsigs.test.cpp b/tests/beman/execution/exec-getcomplsigs.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-getcomplsigs.test.cpp             -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>

diff --git a/tests/beman/execution/exec-into-variant.test.cpp b/tests/beman/execution/exec-into-variant.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-into-variant.test.cpp             -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/into_variant.hpp>

diff --git a/tests/beman/execution/exec-let.test.cpp b/tests/beman/execution/exec-let.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-let.test.cpp                      -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/let.hpp>

diff --git a/tests/beman/execution/exec-opstate-start.test.cpp b/tests/beman/execution/exec-opstate-start.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-opstate-start.test.cpp            -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>

diff --git a/tests/beman/execution/exec-opstate.test.cpp b/tests/beman/execution/exec-opstate.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-opstate.test.cpp                  -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/operation_state.hpp>

diff --git a/tests/beman/execution/exec-prop.test.cpp b/tests/beman/execution/exec-prop.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/exec-prop.test.cpp                           -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/prop.hpp>

diff --git a/tests/beman/execution/exec-read-env.test.cpp b/tests/beman/execution/exec-read-env.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-read-env.test.cpp                 -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/read_env.hpp>

diff --git a/tests/beman/execution/exec-run-loop-general.test.cpp b/tests/beman/execution/exec-run-loop-general.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-run-loop-general.test.cpp         -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/run_loop.hpp>

diff --git a/tests/beman/execution/exec-run-loop-types.test.cpp b/tests/beman/execution/exec-run-loop-types.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-run-loop-types.test.cpp           -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/run_loop.hpp>

diff --git a/tests/beman/execution/exec-sched.test.cpp b/tests/beman/execution/exec-sched.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-sched.test.cpp                    -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/scheduler.hpp>

diff --git a/tests/beman/execution/exec-schedule-from.test.cpp b/tests/beman/execution/exec-schedule-from.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-schedule-from.test.cpp            -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/schedule_from.hpp>

diff --git a/tests/beman/execution/exec-schedule.test.cpp b/tests/beman/execution/exec-schedule.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-schedule.test.cpp                 -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/schedule.hpp>

diff --git a/tests/beman/execution/exec-scope-concepts.test.cpp b/tests/beman/execution/exec-scope-concepts.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/exec-scope-concepts.test.cpp                 -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/scope_token.hpp>

diff --git a/tests/beman/execution/exec-scope-counting.test.cpp b/tests/beman/execution/exec-scope-counting.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/exec-scope-counting.test.cpp                 -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/counting_scope.hpp>

diff --git a/tests/beman/execution/exec-scope-simple-counting.test.cpp b/tests/beman/execution/exec-scope-simple-counting.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/exec-scope-simple-counting.test.cpp          -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/simple_counting_scope.hpp>

diff --git a/tests/beman/execution/exec-set-error.test.cpp b/tests/beman/execution/exec-set-error.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-set-error.test.cpp                      -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>

diff --git a/tests/beman/execution/exec-set-stopped.test.cpp b/tests/beman/execution/exec-set-stopped.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-set-stopped.test.cpp              -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>

diff --git a/tests/beman/execution/exec-set-value.test.cpp b/tests/beman/execution/exec-set-value.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-set-value.test.cpp                -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>

diff --git a/tests/beman/execution/exec-snd-apply.test.cpp b/tests/beman/execution/exec-snd-apply.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-snd-apply.test.cpp                -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/apply_sender.hpp>

diff --git a/tests/beman/execution/exec-snd-transform.test.cpp b/tests/beman/execution/exec-snd-transform.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-snd-transform.test.cpp            -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/transform_sender.hpp>

diff --git a/tests/beman/execution/exec-starts-on.test.cpp b/tests/beman/execution/exec-starts-on.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-starts-on.test.cpp                -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/starts_on.hpp>

diff --git a/tests/beman/execution/exec-sync-wait.test.cpp b/tests/beman/execution/exec-sync-wait.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-sync-wait.test.cpp                -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>