Merge pull request #4 from steve-downey/fix-issues

Fix issues

.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()

Makefile

@@ -0,0 +1,97 @@
+#! /usr/bin/make -f
+# cmake-format: off
+# /Makefile -*-makefile-*-
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+# cmake-format: on
+
+INSTALL_PREFIX?=.install/
+PROJECT?=$(shell basename $(CURDIR))
+BUILD_DIR?=.build
+DEST?=$(INSTALL_PREFIX)
+CMAKE_FLAGS?=
+
+TARGETS := test clean all ctest
+
+export
+
+.update-submodules:
+	git submodule update --init --recursive
+	touch .update-submodules
+
+.gitmodules: .update-submodules
+
+CONFIG?=Asan
+
+export
+
+ifeq ($(strip $(TOOLCHAIN)),)
+	_build_name?=build-system/
+	_build_dir?=.build/
+	_configuration_types?="RelWithDebInfo;Debug;Tsan;Asan"
+	_cmake_args=-DCMAKE_TOOLCHAIN_FILE=$(CURDIR)/etc/toolchain.cmake
+else
+	_build_name?=build-$(TOOLCHAIN)
+	_build_dir?=.build/
+	_configuration_types?="RelWithDebInfo;Debug;Tsan;Asan"
+	_cmake_args=-DCMAKE_TOOLCHAIN_FILE=$(CURDIR)/etc/$(TOOLCHAIN)-toolchain.cmake
+endif
+
+
+_build_path?=$(_build_dir)/$(_build_name)
+
+define run_cmake =
+	cmake \
+	-G "Ninja Multi-Config" \
+	-DCMAKE_CONFIGURATION_TYPES=$(_configuration_types) \
+	-DCMAKE_INSTALL_PREFIX=$(abspath $(INSTALL_PREFIX)) \
+	-DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
+	$(_cmake_args) \
+	$(CURDIR)
+endef
+
+default: test
+
+$(_build_path):
+	mkdir -p $(_build_path)
+
+$(_build_path)/CMakeCache.txt: | $(_build_path) .gitmodules
+	cd $(_build_path) && $(run_cmake)
+	-rm compile_commands.json
+	ln -s $(_build_path)/compile_commands.json
+
+compile: $(_build_path)/CMakeCache.txt ## Compile the project
+	cmake --build $(_build_path)  --config $(CONFIG) --target all -- -k 0
+
+install: $(_build_path)/CMakeCache.txt ## Install the project
+	DESTDIR=$(abspath $(DEST)) ninja -C $(_build_path) -k 0  install
+
+ctest: $(_build_path)/CMakeCache.txt ## Run CTest on current build
+	cd $(_build_path) && ctest --output-on-failure
+
+ctest_ : compile
+	cd $(_build_path) && ctest -C $(CONFIG) --output-on-failure
+
+test: ctest_ ## Rebuild and run tests
+
+cmake: |  $(_build_path)
+	cd $(_build_path) && ${run_cmake}
+
+clean: $(_build_path)/CMakeCache.txt ## Clean the build artifacts
+	cmake --build $(_build_path)  --config $(CONFIG) --target clean
+
+realclean: ## Delete the build directory
+	rm -rf $(_build_path)
+
+env:
+	$(foreach v, $(.VARIABLES), $(info $(v) = $($(v))))
+
+.PHONY : compile install ctest ctest_ test cmake clean realclean env
+
+.PHONY: papers
+papers:
+	$(MAKE) -C papers papers
+
+# Help target
+.PHONY: help
+help: ## Show this help.
+	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'  $(MAKEFILE_LIST) targets.mk | sort

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)