Merge branch 'main' into precommit

Author: steve-downey

.github/workflows/ci.yml

@@ -16,6 +16,8 @@ jobs:
           - {name: "Ubuntu Clang 18", os: ubuntu-24.04, toolchain: "clang-18", clang_version: 18, installed_clang_version: 17, cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" "}
           # Note: clang-19 + Asan setup causes errors on some platforms. Temporary skip some checks via .asan_options.
           - {name: "Ubuntu Clang 19", os: ubuntu-24.04, toolchain: "clang-19", clang_version: 19, installed_clang_version: 17, cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" ", asan_options: "new_delete_type_mismatch=0"}
+          - {name: "Ubuntu GCC 11", os: ubuntu-24.04, toolchain: "gcc-11",  cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" "}
+          - {name: "Ubuntu GCC 12", os: ubuntu-24.04, toolchain: "gcc-12",  cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" "}
           - {name: "Ubuntu GCC 13", os: ubuntu-24.04, toolchain: "gcc-13",  cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" "}
           - {name: "Ubuntu GCC 14", os: ubuntu-24.04, toolchain: "gcc-14", cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" "}
     steps:

CMakeLists.txt

@@ -1,7 +1,6 @@
-# cmake-format: off
-# /CMakeLists.txt -*-makefile-*-
+# CMakeLists.txt                                                    -*-CMake-*-
+#
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-# cmake-format: on
 
 cmake_minimum_required(VERSION 3.27)
 
@@ -22,7 +21,7 @@ if(BUILD_TESTING)
   FetchContent_Declare(
     googletest
     GIT_REPOSITORY https://github.com/google/googletest.git
-    GIT_TAG f8d7d77c06936315286eb55f8de22cd23c188571 # release-1.14.0
+    GIT_TAG e39786088138f2749d64e9e90e0f9902daa77c40 # release-1.15.0
   )
   FetchContent_MakeAvailable(googletest)
 endif()

etc/gcc-15-toolchain.cmake

@@ -0,0 +1,6 @@
+include_guard(GLOBAL)
+
+include("${CMAKE_CURRENT_LIST_DIR}/gcc-flags.cmake")
+
+set(CMAKE_C_COMPILER gcc-15)
+set(CMAKE_CXX_COMPILER g++-15)

include/Beman/Optional26/optional.hpp

@@ -12,7 +12,8 @@ target_include_directories(
   beman_optional26
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../include>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_LOWER_PROJECT_NAME}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../src/>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_LOWER_PROJECT_NAME}> # <prefix>/include/scratch
 )
 
 install(

src/Beman/Optional26/CMakeLists.txt

@@ -1,4 +1,4 @@
-// src/Beman/Optional26/optional.cpp -*-C++-*-
+// src/Beman/Optional26/optional.cpp                                  -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <Beman/Optional26/optional.hpp>

src/Beman/Optional26/optional.cpp

@@ -8,11 +8,26 @@ include(GoogleTest)
 # Tests
 add_executable(
   beman_optional26_test
-  detail/iterator.t.cpp optional_monadic.t.cpp optional_range_support.t.cpp
-  optional_ref_monadic.t.cpp optional_ref.t.cpp optional.t.cpp)
+  )
 
-target_link_libraries(beman_optional26_test beman_optional26 GTest::gtest
-                      GTest::gtest_main)
+target_sources(
+  beman_optional26_test
+  PRIVATE
+  optional_monadic.t.cpp
+  optional_range_support.t.cpp
+  optional_ref_monadic.t.cpp
+  optional_ref.t.cpp
+  optional.t.cpp
+  optional_constexpr.t.cpp
+  test_types.cpp
+  test_utilities.cpp)
+
+target_link_libraries(
+  beman_optional26_test
+  PRIVATE
+  beman_optional26
+  GTest::gtest
+  GTest::gtest_main)
 
 # Issue #32: Re-enable ASAN run CI/clang-19.
 #