wip modules

Author: ednolan

CMakeLists.txt

@@ -2,6 +2,13 @@
 
 cmake_minimum_required(VERSION 3.28...4.2)
 
+# TODO: Set BEMAN_USE_MODULES if one of a particular set of compiler versions is being used
+
+if (BEMAN_USE_MODULES)
+  set(CMAKE_CXX_SCAN_FOR_MODULES ON)
+  set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD "d0edc3af-4c50-42ea-a356-e2862fe7a444")
+endif()
+
 project(
     beman.transform_view # CMake Project Name, which is also the name of the top-level
     # targets (e.g., library, executable, etc.).
@@ -41,10 +48,13 @@ set_target_properties(
 )
 
 add_subdirectory(include/beman/transform_view)
+if (BEMAN_USE_MODULES)
+    add_subdirectory(src/beman/transform_view)
+endif()
 
 include(CTest)
 
-beman_install_library(beman.transform_view TARGETS beman.transform_view)
+beman_install_library(beman.transform_view TARGETS beman.transform_view beman.transform_view.module)
 
 if(BEMAN_TRANSFORM_VIEW_BUILD_TESTS)
     enable_testing()

include/beman/transform_view/transform_view.hpp

@@ -3,10 +3,12 @@
 #ifndef BEMAN_TRANSFORM_VIEW_HPP
 #define BEMAN_TRANSFORM_VIEW_HPP
 
+#ifndef BEMAN_HAS_MODULES
 #include <functional>
 #include <iterator>
 #include <optional>
 #include <ranges>
+#endif
 
 namespace beman::transform_view {
 
@@ -504,7 +506,7 @@ struct bind_back_t {
   private:
     using indices = std::index_sequence_for<CapturedArgs...>;
 
-    template <typename T, size_t... I, typename... Args>
+    template <typename T, std::size_t... I, typename... Args>
     static constexpr decltype(auto)
     call_impl(T&& this_, std::index_sequence<I...>, Args&&... args) {
         return ((T&&)this_)

src/beman/transform_view/CMakeLists.txt

@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+add_library(beman.transform_view.module STATIC)
+add_library(beman::transform_view.module ALIAS beman.transform_view.module)
+
+target_sources(
+    beman.transform_view.module
+    PUBLIC FILE_SET CXX_MODULES FILES transform_view.cppm
+)
+
+target_include_directories(
+    beman.transform_view.module
+    PUBLIC
+    ${PROJECT_SOURCE_DIR}/include
+)
+
+target_compile_definitions(
+  beman.transform_view.module
+  PUBLIC BEMAN_HAS_MODULES)
+
+set_target_properties(
+    beman.transform_view.module
+    PROPERTIES CXX_MODULE_STD ON
+)

src/beman/transform_view/transform_view.cppm

@@ -0,0 +1,11 @@
+module;
+
+export module beman.transform_view;
+
+import std;
+
+extern "C++" {
+export {
+    #include <beman/transform_view/transform_view.hpp>
+}
+}

tests/beman/transform_view/CMakeLists.txt

@@ -12,5 +12,15 @@ target_link_libraries(
     PRIVATE beman::transform_view GTest::gtest GTest::gtest_main
 )
 
+add_executable(beman.transform_view.tests.module_smoke_test)
+target_sources(
+    beman.transform_view.tests.module_smoke_test
+    PRIVATE module_smoke_test.test.cpp
+)
+target_link_libraries(
+    beman.transform_view.tests.module_smoke_test
+    PRIVATE beman::transform_view.module
+)
+
 include(GoogleTest)
 gtest_discover_tests(beman.transform_view.tests.transform_view)

tests/beman/transform_view/module_smoke_test.test.cpp

@@ -0,0 +1,4 @@
+import beman.transform_view;
+
+int main() {
+}