Feature/prepare cmake v4.3 (#221)

* Prepare use of cmake v4.3

* Fix typos

* Quickfix: PROJECT_NAME as prefix for cmake variable names

Author: ClausKlein

.clang-format

@@ -4,7 +4,6 @@ Language:        Json
 IndentWidth:     2
 UseTab:          Never
 ---
-BasedOnStyle:    LLVM
 Language:        JavaScript
 IndentWidth:     4
 UseTab:          Never

.codespellignore

@@ -2,5 +2,6 @@ cancelled
 copyable
 pullrequest
 snd
+dur
 statics
 Claus

.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
     rev: v2.4.1
     hooks:
       - id: codespell
-        files: ^.*\.(cmake|cpp|hpp|txt|md|json|in|yaml|yml|py|toml)$
+        files: ^.*\.(cmake|cpp|cppm|hpp|txt|md|mds|json|js|in|yaml|yml|py|toml)$
         args: ["--write", "--ignore-words", ".codespellignore" ]
 
   # Clang-format for C++
@@ -27,7 +27,7 @@ repos:
     rev: v21.1.8
     hooks:
       - id: clang-format
-        types_or: [c++, c, json]
+        types_or: [c++, c, json, javascript]
         exclude: docs/TODO.json
 
   # CMake linting and formatting
@@ -48,7 +48,7 @@ repos:
   # Config file: pyproject.toml
   # first Python sort imports
   - repo: https://github.com/pycqa/isort
-    rev: 7.0.0
+    rev: 8.0.0
     hooks:
       - id: isort
 

CMakeLists.txt

@@ -3,21 +3,19 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 # gersemi: on
 
-cmake_minimum_required(VERSION 3.30...4.2)
+cmake_minimum_required(VERSION 3.30...4.3)
 
 include(./cmake/prelude.cmake)
 
 #===================================================
-project(beman.execution VERSION 0.2.0 LANGUAGES CXX)
+project(beman.execution VERSION 0.3.0 LANGUAGES CXX)
 #===================================================
 
 # Modules opt in only on compilers that support it: msvc, g++-15 and clang-20+
 include(./cmake/cxx-modules-rules.cmake)
 
-set(TARGET_NAME beman.execution_headers) # used in src, and docs
-set(TARGET_NAMESPACE beman) # TODO(CK): still used in docs, is this really needed?
-set(TARGET_PREFIX ${PROJECT_NAME}) # NOTE: used in src, and docs?
-set(TARGETS_EXPORT_NAME ${PROJECT_NAME}-targets) # NOTE: must be set, is important for installation! CK
+set(BEMAN_EXECUTION_TARGET_NAME beman.execution_headers) # used in src, and docs
+set(BEMAN_EXECUTION_TARGET_PREFIX ${PROJECT_NAME}) # NOTE: used in src, and docs?
 
 #===============================================================================
 if(BEMAN_USE_MODULES)
@@ -29,31 +27,34 @@ if(BEMAN_USE_MODULES)
 
     # 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_PREFIX} STATIC) # FIXME: only static yet! CK
-    add_library(beman::execution ALIAS ${TARGET_PREFIX})
+    add_library(${BEMAN_EXECUTION_TARGET_PREFIX} STATIC) # FIXME: only static yet! CK
+    add_library(beman::execution ALIAS ${BEMAN_EXECUTION_TARGET_PREFIX})
     target_compile_features(
-        ${TARGET_PREFIX}
+        ${BEMAN_EXECUTION_TARGET_PREFIX}
         PUBLIC cxx_std_${CMAKE_CXX_STANDARD}
     )
 
     # TODO(CK): the export header should be used!
     include(GenerateExportHeader)
     generate_export_header(
-        ${TARGET_PREFIX}
-        BASE_NAME ${TARGET_PREFIX}
+        ${BEMAN_EXECUTION_TARGET_PREFIX}
+        BASE_NAME ${BEMAN_EXECUTION_TARGET_PREFIX}
         EXPORT_FILE_NAME beman/execution/modules_export.hpp
     )
     target_sources(
-        ${TARGET_PREFIX}
+        ${BEMAN_EXECUTION_TARGET_PREFIX}
         PUBLIC
             FILE_SET HEADERS
                 BASE_DIRS include ${CMAKE_CURRENT_BINARY_DIR}
                 FILES
                     ${CMAKE_CURRENT_BINARY_DIR}/beman/execution/modules_export.hpp
     )
-    target_compile_definitions(${TARGET_PREFIX} PUBLIC BEMAN_HAS_MODULES)
+    target_compile_definitions(
+        ${BEMAN_EXECUTION_TARGET_PREFIX}
+        PUBLIC BEMAN_HAS_MODULES
+    )
     set_target_properties(
-        ${TARGET_PREFIX}
+        ${BEMAN_EXECUTION_TARGET_PREFIX}
         PROPERTIES
             VERSION ${PROJECT_VERSION}
             SOVERSION ${PROJECT_VERSION_MAJOR}
@@ -63,20 +64,29 @@ if(BEMAN_USE_MODULES)
     # FIXME: Quickfix only to prevent linker problems on windows dll? CK
     if(WIN32 AND BUILD_SHARED_LIBS)
         set_target_properties(
-            ${TARGET_PREFIX}
+            ${BEMAN_EXECUTION_TARGET_PREFIX}
             PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON
         )
     endif()
 
     find_package(Threads REQUIRED)
-    target_link_libraries(${TARGET_PREFIX} PUBLIC Threads::Threads)
+    target_link_libraries(
+        ${BEMAN_EXECUTION_TARGET_PREFIX}
+        PUBLIC Threads::Threads
+    )
 else()
     set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
 endif()
 
 if(BEMAN_USE_MODULES AND BEMAN_HAS_IMPORT_STD)
-    target_compile_definitions(${TARGET_PREFIX} PUBLIC BEMAN_HAS_IMPORT_STD)
-    set_target_properties(${TARGET_PREFIX} PROPERTIES CXX_MODULE_STD ON)
+    target_compile_definitions(
+        ${BEMAN_EXECUTION_TARGET_PREFIX}
+        PUBLIC BEMAN_HAS_IMPORT_STD
+    )
+    set_target_properties(
+        ${BEMAN_EXECUTION_TARGET_PREFIX}
+        PROPERTIES CXX_MODULE_STD ON
+    )
 elseif(BEMAN_USE_MODULES)
     message(WARNING "Missing or disabled support for CMAKE_CXX_MODULE_STD!")
 endif()
@@ -99,8 +109,7 @@ add_subdirectory(src/beman/execution)
 #===============================================================================
 # NOTE: this must be done before tests! CK
 include(./cmake/beman-install-library.cmake)
-beman_install_library(${TARGET_PREFIX} TARGETS ${TARGET_NAME} ${TARGET_PREFIX}
-    # TODO: DEPENDENCIES [===[beman.inplace_vector 1.0.0]===] [===[beman.scope 0.0.1 EXACT]===] fmt
+beman_install_library(${BEMAN_EXECUTION_TARGET_PREFIX} TARGETS ${BEMAN_EXECUTION_TARGET_NAME} ${BEMAN_EXECUTION_TARGET_PREFIX}
     DEPENDENCIES Threads
 )
 #===============================================================================

CMakePresets.json

@@ -13,6 +13,7 @@
         "CMAKE_CXX_EXTENSIONS": true,
         "CMAKE_CXX_STANDARD_REQUIRED": true,
         "CMAKE_EXPORT_COMPILE_COMMANDS": true,
+        "CMAKE_INSTALL_MESSAGE": "LAZY",
         "CMAKE_SKIP_TEST_ALL_DEPENDENCY": false,
         "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "infra/cmake/use-fetch-content.cmake"
       }
@@ -105,6 +106,7 @@
         "_debug-base"
       ],
       "cacheVariables": {
+        "BEMAN_USE_STD_MODULE": false,
         "BEMAN_USE_MODULES": false,
         "CMAKE_TOOLCHAIN_FILE": "infra/cmake/appleclang-toolchain.cmake"
       }
@@ -117,6 +119,7 @@
         "_release-base"
       ],
       "cacheVariables": {
+        "BEMAN_USE_STD_MODULE": false,
         "BEMAN_USE_MODULES": false,
         "CMAKE_TOOLCHAIN_FILE": "infra/cmake/appleclang-toolchain.cmake"
       }

cmake/Config.cmake.in

@@ -1,4 +1,4 @@
-# cmake/Config.cmake.in -*-makefile-*-
+# cmake/Config.cmake.in -*-cmake-*-
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 include(CMakeFindDependencyMacro)

cmake/README.md

@@ -162,7 +162,7 @@ include(./cmake/prelude.cmake)
 project(beman.execution VERSION 0.2.0 LANGUAGES CXX)
 include(./cmake/cxx-modules-rules.cmake)
 
-set(TARGET_PREFIX ${PROJECT_NAME})
+set(BEMAN_EXECUTION_TARGET_PREFIX ${PROJECT_NAME})
 
 #===============================================================================
 if(BEMAN_USE_MODULES)
@@ -171,32 +171,32 @@ if(BEMAN_USE_MODULES)
 
     # 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_PREFIX} STATIC)
-    add_library(beman::execution ALIAS ${TARGET_PREFIX})
+    add_library(${BEMAN_EXECUTION_TARGET_PREFIX} STATIC)
+    add_library(beman::execution ALIAS ${BEMAN_EXECUTION_TARGET_PREFIX})
     target_compile_features(
-        ${TARGET_PREFIX}
+        ${BEMAN_EXECUTION_TARGET_PREFIX}
         PUBLIC cxx_std_${CMAKE_CXX_STANDARD}
     )
 
     include(GenerateExportHeader)
     generate_export_header(
-        ${TARGET_PREFIX}
-        BASE_NAME ${TARGET_PREFIX}
+        ${BEMAN_EXECUTION_TARGET_PREFIX}
+        BASE_NAME ${BEMAN_EXECUTION_TARGET_PREFIX}
         EXPORT_FILE_NAME beman/execution/modules_export.hpp
     )
     target_sources(
-        ${TARGET_PREFIX}
+        ${BEMAN_EXECUTION_TARGET_PREFIX}
         PUBLIC
             FILE_SET HEADERS
                 BASE_DIRS include ${CMAKE_CURRENT_BINARY_DIR}
                 FILES
                     ${CMAKE_CURRENT_BINARY_DIR}/beman/execution/modules_export.hpp
     )
-    target_compile_definitions(${TARGET_PREFIX} PUBLIC BEMAN_HAS_MODULES)
+    target_compile_definitions(${BEMAN_EXECUTION_TARGET_PREFIX} PUBLIC BEMAN_HAS_MODULES)
 endif()
 
 if(BEMAN_USE_MODULES AND CMAKE_CXX_MODULE_STD)
-    target_compile_definitions(${TARGET_PREFIX} PUBLIC BEMAN_HAS_IMPORT_STD)
+    target_compile_definitions(${BEMAN_EXECUTION_TARGET_PREFIX} PUBLIC BEMAN_HAS_IMPORT_STD)
 else()
     message(WARNING "Missing support for CMAKE_CXX_MODULE_STD!")
 endif()
@@ -206,7 +206,7 @@ endif()
 
 # NOTE: this must be done before tests! CK
 include(beman-install-library)
-beman_install_library(${PROJECT_NAME} TARGETS ${TARGET_PREFIX} beman.exemplar_headers #
+beman_install_library(${PROJECT_NAME} TARGETS ${BEMAN_EXECUTION_TARGET_PREFIX} beman.exemplar_headers #
     # TODO(add): DEPENDENCIES [===[beman.inplace_vector 1.0.0]===] [===[beman.scope 0.0.1 EXACT]===] fmt
 )
 ```

cmake/prelude.cmake

@@ -17,17 +17,21 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
+# ---------------------------------------------------------------------------
+# The CMAKE_EXPERIMENTAL_CXX_IMPORT_STD is not longer needed except for OSX
 # ---------------------------------------------------------------------------
 if(NOT BEMAN_USE_STD_MODULE OR CMAKE_VERSION VERSION_GREATER_EQUAL 4.3)
-    return()
+    if(NOT APPLE)
+        return()
+    endif()
 endif()
 # ---------------------------------------------------------------------------
 
 # gersemi: off
 # ---------------------------------------------------------------------------
 # check if import std; is supported by CMAKE_CXX_COMPILER
 # ---------------------------------------------------------------------------
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.2)
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.2 AND CMAKE_VERSION VERSION_LESS 4.3)
     if(PROJECT_NAME)
         message(
             WARNING
@@ -39,10 +43,10 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.2)
 endif()
 # gersemi: on
 
-# TODO(CK): Do we need this HACK for linux too?
-# if(NOT APPLE)
-#     return()
-# endif()
+# TODO(CK): Do we need this HACK still for linux too?
+if(NOT APPLE)
+    return()
+endif()
 
 # FIXME: clang++ we still needs to export CXX=clang++
 if("$ENV{CXX}" STREQUAL "" AND CMAKE_CXX_COMPILER)
@@ -76,6 +80,8 @@ if(
         add_link_options(-L${LLVM_DIR}/lib/c++)
         include_directories(SYSTEM ${LLVM_DIR}/include)
 
+        # /usr/local/Cellar/llvm/21.1.8_1/lib/c++/libc++.modules.json
+        # "/usr/local/Cellar/llvm/21.1.8_1/share/libc++/v1/std.cppm",
         set(CMAKE_CXX_STDLIB_MODULES_JSON
             ${LLVM_DIR}/lib/c++/libc++.modules.json
         )

docs/code/CMakeLists.txt

@@ -10,11 +10,11 @@ set(EXAMPLES)
 # endif()
 
 foreach(EXAMPLE ${EXAMPLES})
-    set(EXAMPLE_TARGET ${TARGET_PREFIX}.tutorial.${EXAMPLE})
+    set(EXAMPLE_TARGET ${BEMAN_EXECUTION_TARGET_PREFIX}.tutorial.${EXAMPLE})
     add_executable(${EXAMPLE_TARGET})
     target_sources(${EXAMPLE_TARGET} PRIVATE ${EXAMPLE}.cpp)
     target_link_libraries(
         ${EXAMPLE_TARGET}
-        PRIVATE ${TARGET_NAMESPACE}::${TARGET_NAME}
+        PRIVATE beman::${BEMAN_EXECUTION_TARGET_NAME}
     )
 endforeach()

docs/tutorial.mds

@@ -204,7 +204,7 @@ pipe notation.
 	    result of the algorithm is the value returned from this
 	    invocation (if any). If the invocation of <code>_fun_</code>
 	    throws, the algorithm completes with an error
-      provding an `std::exception_ptr` to caught exception. If
+      providing an `std::exception_ptr` to caught exception. If
       <code>_sender_</code> doesn't complete accordingly to the
       algorithm's name, the completion is forwarded.
 	        </details>