cleanup after review

Author: ClausKlein

CMakeLists.txt

@@ -1,17 +1,15 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-if(NOT DEFINED CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 20)
-endif()
 
-# TODO(CK): set(CMAKE_CXX_MODULE_STD 1)
-if(CMAKE_CXX_MODULE_STD)
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-    set(CMAKE_CXX_STANDARD 26)
+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_EXPERIMENTAL_CXX_IMPORT_STD
+            "d0edc3af-4c50-42ea-a356-e2862fe7a444"
+        )
+    endif()
+    set(CMAKE_CXX_STANDARD_REQUIRED OFF)
 endif()
-set(CMAKE_CXX_STANDARD_REQUIRED OFF)
-set(CMAKE_CXX_SCAN_FOR_MODULES 1)
 
 cmake_minimum_required(VERSION 3.28...4.0)
 
@@ -44,9 +42,8 @@ option(
     ${PROJECT_IS_TOP_LEVEL}
 )
 
-add_library(beman.scope)
+add_library(beman.scope INTERFACE)
 add_library(beman::scope ALIAS beman.scope)
-target_compile_features(beman.scope PRIVATE cxx_std_20)
 
 # gersemi: off
 
@@ -57,17 +54,29 @@ set_target_properties(
         EXPORT_NAME scope
 )
 
-target_sources(
-    beman.scope
-    PUBLIC
-        FILE_SET HEADERS
-        BASE_DIRS include
-        FILES include/beman/scope/scope.hpp
-    PUBLIC
-        FILE_SET CXX_MODULES
-        BASE_DIRS include
-        FILES include/beman/scope/beman.scope.cppm
-)
+if(CMAKE_CXX_SCAN_FOR_MODULES)
+    target_compile_features(beman.scope PRIVATE cxx_std_23)
+    target_sources(
+        beman.scope
+        PUBLIC
+            FILE_SET HEADERS
+            BASE_DIRS include
+            FILES include/beman/scope/scope.hpp
+        PUBLIC
+            FILE_SET CXX_MODULES
+            BASE_DIRS include
+            FILES include/beman/scope/beman.scope.cppm
+    )
+else()
+    target_compile_features(beman.scope INTERFACE cxx_std_20)
+    target_sources(
+        beman.scope
+        INTERFACE
+            FILE_SET HEADERS
+            BASE_DIRS include
+            FILES include/beman/scope/scope.hpp
+    )
+endif()
 
 include(GNUInstallDirs)
 
@@ -77,7 +86,6 @@ install(
     EXPORT beman.scope-targets
 
     FILE_SET CXX_MODULES
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILE_SET HEADERS
 )
 

tests/CMakeLists.txt

@@ -5,9 +5,9 @@ include(FetchContent)
 FetchContent_Declare(
     Catch2
     GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-    GIT_TAG v3.8.0
+    GIT_TAG v3.8.1
     SYSTEM
-    # MAYBY: FIND_PACKAGE_ARGS 3.8.0
+    # FIXME: FIND_PACKAGE_ARGS 3.8.1
 )
 FetchContent_MakeAvailable(Catch2)
 
@@ -17,20 +17,21 @@ message("Tests to be built: ${ALL_TESTNAMES}")
 
 include(Catch)
 
-add_executable(test.module)
-target_sources(test.module PRIVATE module.test.cpp)
-# MAYBE: target_compile_features(test.module PRIVATE cxx_std_23)
-target_link_libraries(test.module PRIVATE beman::scope)
-
-add_test(NAME test.module COMMAND test.module)
-
-# XXX NO! target_compile_options(test.module PRIVATE "-fmodules")
-# target_link_libraries(
-#     test.module
-#     PUBLIC FILE_SET TYPE CXX_MODULES include/beman/scope/beman.scope.cppm
-#     PRIVATE Catch2::Catch2WithMain beman::scope
-# )
-# catch_discover_tests(test.module)
+if(CMAKE_CXX_SCAN_FOR_MODULES)
+    add_executable(test.module)
+    target_sources(test.module PRIVATE module.test.cpp)
+    target_compile_features(test.module PRIVATE cxx_std_23)
+    target_link_libraries(test.module PRIVATE beman::scope)
+    add_test(NAME test.module COMMAND test.module)
+
+    # XXX NO! target_compile_options(test.module PRIVATE "-fmodules")
+    # target_link_libraries(
+    #     test.module
+    #     PUBLIC FILE_SET TYPE CXX_MODULES include/beman/scope/beman.scope.cppm
+    #     PRIVATE Catch2::Catch2WithMain beman::scope
+    # )
+    # catch_discover_tests(test.module)
+endif()
 
 foreach(testname ${ALL_TESTNAMES})
     add_executable(test.${testname})