Make it more usable

Author: ClausKlein

CMakeLists.txt

@@ -1,14 +1,14 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 if(CMAKE_CXX_STANDARD STREQUAL 26)
-    set(CMAKE_CXX_SCAN_FOR_MODULES 1)
-    set(CMAKE_CXX_MODULE_STD 1)
     if(CMAKE_CXX_MODULE_STD)
+        set(CMAKE_CXX_SCAN_FOR_MODULES 1)
         set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
             "d0edc3af-4c50-42ea-a356-e2862fe7a444"
         )
     endif()
     set(CMAKE_CXX_STANDARD_REQUIRED OFF)
+    add_definitions(-DHAS_STDLIB_MODULES)
 endif()
 
 cmake_minimum_required(VERSION 3.28...4.0)
@@ -20,7 +20,28 @@ project(
     VERSION 0.0.1
 )
 
+# module will only compile with gcc15 or clang20 and above
+if(
+    CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
+    AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 20
+)
+    set(CMAKE_CXX_SCAN_FOR_MODULES 1)
+elseif(
+    CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+    AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15
+)
+    set(CMAKE_CXX_SCAN_FOR_MODULES 1)
+else(NOT CMAKE_CXX_MODULE_STD)
+    set(CMAKE_CXX_SCAN_FOR_MODULES 0)
+endif()
+
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+message(STATUS "CMAKE_CXX_SCAN_FOR_MODULES: ${CMAKE_CXX_SCAN_FOR_MODULES}")
+message(STATUS "CMAKE_CXX_MODULE_STD: ${CMAKE_CXX_MODULE_STD}")
+message(
+    STATUS
+    "CMAKE_CXX_COMPILER_IMPORT_STD: ${CMAKE_CXX_COMPILER_IMPORT_STD}"
+)
 
 # [CMAKE.SKIP_TESTS]
 option(
@@ -87,6 +108,7 @@ install(
     EXPORT beman.scope-targets
 
     FILE_SET CXX_MODULES
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILE_SET HEADERS
 )
 

tests/CMakeLists.txt

@@ -11,20 +11,17 @@ FetchContent_Declare(
 )
 FetchContent_MakeAvailable(Catch2)
 
-message(STATUS
+message(
+    DEBUG
     "Compiler is: ${CMAKE_CXX_COMPILER_ID} version: ${CMAKE_CXX_COMPILER_VERSION}"
 )
 
-# module tests will only compile with gcc15 or clang20 and above
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 20)
-    set(ALL_TESTNAMES scope_success scope_exit scope_fail unique_resource module)
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15)
-    set(ALL_TESTNAMES scope_success scope_exit scope_fail unique_resource module)
-else()
-    set(ALL_TESTNAMES scope_success scope_exit scope_fail unique_resource)
+set(ALL_TESTNAMES scope_success scope_exit scope_fail unique_resource)
+if(CMAKE_CXX_SCAN_FOR_MODULES)
+    list(APPEND ALL_TESTNAMES module)
 endif()
 
-message(STATUS "Tests to be built: ${ALL_TESTNAMES}")
+message(DEBUG "Tests to be built: ${ALL_TESTNAMES}")
 
 include(Catch)
 

tests/module.test.cpp

@@ -4,6 +4,9 @@
 #include <catch2/catch_all.hpp>
 
 // for g++-15 the order is important -- import after includes
+#ifdef HAS_STDLIB_MODULES
+import std;
+#endif
 import beman.scope;
 
 struct DummyResource {
@@ -33,5 +36,4 @@ TEST_CASE("module-test", "[scope_module_test]") {
     REQUIRE(success_ran == true);
     REQUIRE(fail_ran == false);
     REQUIRE(cleaned == true);
-
 }