Feat: Prepare CXX_MODULES tests

Author: ClausKlein

CMakeLists.txt

@@ -34,7 +34,7 @@ set(TARGET_PREFIX ${TARGET_NAMESPACE}.${TARGET_NAME})
 set(TARGET_LIBRARY ${PROJECT_NAME})
 set(TARGET_ALIAS ${TARGET_NAMESPACE}::${TARGET_NAME})
 set(TARGET_PACKAGE_NAME ${PROJECT_NAME}-config)
-set(TARGETS_EXPORT_NAME ${PROJECT_NAME}-config-targets)
+set(TARGETS_EXPORT_NAME ${PROJECT_NAME}-targets)
 
 #========================== post project settings ==============================
 # Tell CMake that we explicitly want `import std`.
@@ -45,13 +45,29 @@ if(${CMAKE_CXX_STANDARD} IN_LIST CMAKE_CXX_COMPILER_IMPORT_STD)
     message(STATUS "CMAKE_CXX_MODULE_STD=${CMAKE_CXX_MODULE_STD}")
 endif()
 
+add_library(${TARGET_NAME} STATIC)
+
+# CMake requires the language standard to be specified as compile feature
+# when a target provides C++23 modules and the target will be installed
+target_compile_features(${TARGET_NAME} PUBLIC cxx_std_23)
+
 if(CMAKE_CXX_SCAN_FOR_MODULES AND ${CMAKE_GENERATOR} STREQUAL Ninja)
     set(BEMAN_USE_MODULES ON)
     message(STATUS "BEMAN_USE_MODULES=${BEMAN_USE_MODULES}")
+    target_compile_definitions(${TARGET_NAME} PUBLIC BEMAN_USE_MODULES)
 else()
     message(WARNING "Missing support for CMAKE_CXX_SCAN_FOR_MODULES!")
 endif()
 
+if(BEMAN_USE_MODULES AND CMAKE_CXX_MODULE_STD)
+    set(BEMAN_HAS_IMPORT_STD ON)
+    message(STATUS "BEMAN_HAS_IMPORT_STD=${BEMAN_HAS_IMPORT_STD}")
+    target_compile_definitions(${TARGET_NAME} PUBLIC BEMAN_HAS_IMPORT_STD)
+else()
+    set(CMAKE_CXX_MODULE_STD OFF)
+    message(WARNING "Missing support for CMAKE_CXX_MODULE_STD!")
+endif()
+
 # gersemi: off
 if(CMAKE_EXPORT_COMPILE_COMMANDS)
     set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
@@ -61,17 +77,6 @@ if(CMAKE_EXPORT_COMPILE_COMMANDS)
     )
 endif()
 # gersemi: on
-
-# CMake requires the language standard to be specified as compile feature
-# when a target provides C++23 modules and the target will be installed
-add_library(${TARGET_NAME} STATIC)
-target_compile_features(${TARGET_NAME} PUBLIC cxx_std_23)
-
-if(BEMAN_USE_MODULES AND CMAKE_CXX_MODULE_STD)
-    target_compile_definitions(${TARGET_NAME} PUBLIC BEMAN_HAS_IMPORT_STD)
-else()
-    message(WARNING "Missing support for CMAKE_CXX_MODULE_STD!")
-endif()
 #===============================================================================
 
 option(

Makefile

@@ -31,12 +31,12 @@ endif
 LDFLAGS   ?=
 SAN_FLAGS ?=
 CXX_FLAGS ?= -g
-# TODO: SANITIZER := release
-SANITIZER ?= default
+SANITIZER := release
+SANITIZER ?= RelWithDebInfo
 SOURCEDIR = $(CURDIR)
 BUILDROOT = build
 export hostSystemName:=$(shell uname -s)
-# TODO BUILD     := $(BUILDROOT)/$(SANITIZER)
+BUILD     := $(BUILDROOT)/$(SANITIZER)
 BUILD     ?= $(BUILDROOT)/$(hostSystemName)/$(SANITIZER)
 EXAMPLE   = beman.execution.examples.stop_token
 
@@ -46,19 +46,19 @@ ifeq (${hostSystemName},Darwin)
   export LLVM_DIR:=$(shell realpath ${LLVM_PREFIX})
   export PATH:=${LLVM_DIR}/bin:${PATH}
 
-  # export CMAKE_CXX_STDLIB_MODULES_JSON=${LLVM_DIR}/lib/c++/libc++.modules.json
-  # export CXX=clang++
-  # export LDFLAGS=-L$(LLVM_DIR)/lib/c++ -lc++abi -lc++ # -lc++experimental
-  # export GCOV="llvm-cov gcov"
+  export CMAKE_CXX_STDLIB_MODULES_JSON=${LLVM_DIR}/lib/c++/libc++.modules.json
+  export CXX=clang++
+  export LDFLAGS=-L$(LLVM_DIR)/lib/c++ -lc++abi # NO! -lc++ -lc++experimental
+  export GCOV="llvm-cov gcov"
 
   ### TODO: to test g++-15:
   export GCC_PREFIX:=$(shell brew --prefix gcc)
   export GCC_DIR:=$(shell realpath ${GCC_PREFIX})
 
-  export CMAKE_CXX_STDLIB_MODULES_JSON=${GCC_DIR}/lib/gcc/current/libstdc++.modules.json
-  export CXX:=g++-15
-  export CXXFLAGS:=-stdlib=libstdc++
-  export GCOV="gcov"
+  # export CMAKE_CXX_STDLIB_MODULES_JSON=${GCC_DIR}/lib/gcc/current/libstdc++.modules.json
+  # export CXX:=g++-15
+  # export CXXFLAGS:=-stdlib=libstdc++
+  # export GCOV="gcov"
 else ifeq (${hostSystemName},Linux)
   export LLVM_DIR=/usr/lib/llvm-20
   export PATH:=${LLVM_DIR}/bin:${PATH}
@@ -95,9 +95,9 @@ ifeq ($(SANITIZER),lsan)
 endif
 
 # TODO: beman.execution.examples.modules
-# FIXME: beman.execution.execution-module.test beman.execution.stop-token-module.test
+FIXME: beman.execution.execution-module.test beman.execution.stop-token-module.test
 
-default: test
+# XXX: NO! $(SANITIZER): test
 
 all: $(SANITIZERS)
 
@@ -111,16 +111,19 @@ doc:
 # 	$(MAKE) SANITIZER=$@
 
 build:
-	cmake --fresh -G Ninja -S $(SOURCEDIR) -B $(BUILD) $(TOOLCHAIN) $(SYSROOT) \
+	cmake -G Ninja -S $(SOURCEDIR) -B $(BUILD) $(TOOLCHAIN) $(SYSROOT) \
 	  -D CMAKE_EXPORT_COMPILE_COMMANDS=ON \
 	  -D CMAKE_SKIP_INSTALL_RULES=ON \
 	  -D CMAKE_CXX_STANDARD=23 \
 	  -D CMAKE_CXX_EXTENSIONS=ON \
 	  -D CMAKE_CXX_STANDARD_REQUIRED=ON \
-	  -D CMAKE_CXX_COMPILER=$(CXX) # XXX -D CMAKE_CXX_FLAGS="$(CXX_FLAGS) $(SAN_FLAGS)"
+	  -D CMAKE_CXX_SCAN_FOR_MODULES=ON \
+	  -D CMAKE_EXPERIMENTAL_CXX_IMPORT_STD=OFF \
+	  -D CMAKE_BUILD_TYPE=$(SANITIZER) \
+	  -D CMAKE_CXX_COMPILER=$(CXX) # XXX --fresh -D CMAKE_CXX_FLAGS="$(CXX_FLAGS) $(SAN_FLAGS)"
 	cmake --build $(BUILD)
 
-# NOTE: without install, see CMAKE_SKIP_INSTALL_RULES! CK
+# NOTE: may w/o enabled install, see CMAKE_SKIP_INSTALL_RULES! CK
 test: build
 	ctest --test-dir $(BUILD) --rerun-failed --output-on-failure
 

cmake/CMakeUserPresets.json

@@ -22,9 +22,16 @@
       "configurePreset": "release",
       "configuration": "Release",
       "targets": [
-        "all_verify_interface_header_sets",
         "all"
       ]
+    },
+    {
+      "name": "verify",
+      "configurePreset": "release",
+      "configuration": "Release",
+      "targets": [
+        "all_verify_interface_header_sets"
+      ]
     }
   ],
   "testPresets": [

cmake/presets/CMakeGenericPresets.json

@@ -1,5 +1,5 @@
 {
-  "version": 6,
+  "version": 9,
   "configurePresets": [
     {
       "name": "root-config",

cmake/presets/CMakeLinuxPresets.json

@@ -1,5 +1,5 @@
 {
-  "version": 6,
+  "version": 9,
   "include": [
     "CMakeGenericPresets.json"
   ],

cmake/presets/CMakeWindowsPresets.json

@@ -1,5 +1,5 @@
 {
-  "version": 6,
+  "version": 9,
   "include": [
     "CMakeGenericPresets.json"
   ],

examples/modules.cpp

@@ -11,17 +11,17 @@ import std;
 
 #endif
 
-#if __cpp_modules < 201907L
-#include <beman/execution/execution.hpp>
-#else
 import beman_execution;
-#endif
 
 namespace ex = beman::execution;
 
 int main() {
+#ifdef USE_THIS_CODE
     auto [result] = ex::sync_wait(ex::when_all(ex::just(std::string("hello, ")), ex::just(std::string("world"))) |
                                   ex::then([](const auto& s1, const auto& s2) { return s1 + s2; }))
                         .value_or(std::tuple(std::string("oops")));
     std::cout << "result='" << result << "'\n";
+#else
+    std::println("ex::version = {}", ex::version);
+#endif
 }

src/beman/execution/CMakeLists.txt

@@ -200,6 +200,11 @@ if(BEMAN_USE_MODULES)
                 BASE_DIRS ${PROJECT_SOURCE_DIR}/src/beman/execution
                 FILES ${PROJECT_SOURCE_DIR}/src/beman/execution/execution.cppm
     )
+else()
+    set_target_properties(
+        ${TARGET_NAME}
+        PROPERTIES VERIFY_INTERFACE_HEADER_SETS ON
+    )
 endif()
 
 get_property(
@@ -209,8 +214,6 @@ get_property(
 )
 source_group("Header Files\\detail" FILES ${DETAIL_HEADER_FILES})
 
-set_target_properties(${TARGET_NAME} PROPERTIES VERIFY_INTERFACE_HEADER_SETS ON)
-
 if(NOT BEMAN_EXECUTION_ENABLE_INSTALL OR CMAKE_SKIP_INSTALL_RULES)
     return()
 endif()
@@ -221,7 +224,7 @@ install(
     ARCHIVE DESTINATION lib/$<CONFIG>
     FILE_SET ${TARGET_NAME}_public_headers
     FILE_SET ${TARGET_NAME}_detail_headers
-    FILE_SET CXX_MODULES DESTINATION ${INSTALL_CONFIGDIR}/module
+    FILE_SET CXX_MODULES DESTINATION ${INSTALL_CONFIGDIR}/cxx-modules
     # There's currently no convention for this location
     CXX_MODULES_BMI
         DESTINATION ${INSTALL_CONFIGDIR}/bmi-${CMAKE_CXX_COMPILER_ID}_$<CONFIG>

src/beman/execution/execution.cppm

@@ -3,22 +3,32 @@
 // ----------------------------------------------------------------------------
 
 module;
+
+#ifndef BEMAN_HAS_IMPORT_STD
 #include <execution>
 #include <stop_token>
-#include <beman/execution/execution.hpp>
+#endif
+
+// FIXME: #include <beman/execution/execution.hpp>
 #include <beman/execution/stop_token.hpp>
 
 export module beman_execution;
 
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
+#endif
+
 namespace beman::execution {
 export int version(0);
+
 // [stoptoken.concepts], stop token concepts
 export using ::beman::execution::stoppable_token;
 export using ::beman::execution::unstoppable_token;
 
 // [stoptoken], class stop_token
 export using ::beman::execution::stop_token;
 
+#ifdef USE_THIS_CODE
 // [stopsource], class stop_source
 export using ::beman::execution::stop_source;
 
@@ -218,5 +228,6 @@ export using ::beman::execution::sync_wait;
 
 // [exec.with.awaitable.senders]
 //-dk:TODO export using ::beman::execution::with_awaitable_senders;
+#endif
 
 } // namespace beman::execution

tests/beman/execution/execution-module.test.cpp

@@ -2,12 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <test/execution.hpp>
-#if 1
-#include <beman/execution/execution.hpp>
+
+#ifdef BEMAN_HAS_IMPORT_STD
+import std;
 #else
-import beman_execution;
+#include <execution>
 #endif
 
+import beman_execution;
+
 // ----------------------------------------------------------------------------
 
 namespace {
@@ -22,11 +25,11 @@ using error_types_of_t = test_stdex::error_types_of_t<S>;
 
 TEST(execution_modules) {
 #if 0
-    //-dk:TOD enable execution policies
-    test::use_type<test_std::sequenced_policy>();
-    test::use_type<test_std::parallel_policy>();
-    test::use_type<test_std::parallel_unsequenced_policy>();
-    test::use_type<test_std::unsequenced_policy>();
+    //-dk:TODO enable execution policies
+    test::check_type<test_std::sequenced_policy>();
+    test::check_type<test_std::parallel_policy>();
+    test::check_type<test_std::parallel_unsequenced_policy>();
+    test::check_type<test_std::unsequenced_policy>();
 
     test::use(test_std::seq);
     test::use(test_std::par);