Merge branch 'dev' into main

Author: jeremy-rifkin

CHANGELOG.md

@@ -1,10 +1,37 @@
+- [libassert 2.0.0-beta](#libassert-200-beta)
 - [libassert 2.0.0-alpha](#libassert-200-alpha)
 - [libassert 1.2.2](#libassert-122)
 - [libassert 1.2.1](#libassert-121)
 - [libassert 1.2](#libassert-12)
 - [libassert 1.1](#libassert-11)
 - [libassert 1.0 🎉](#libassert-10-)
 
+## libassert 2.0.0-beta
+
+Changes:
+- Catch2 and GoogleTest integrations
+- Implemented alternative path modes
+- {fmt} support with `LIBASSERT_USE_FMT`
+- Reworked stringification again
+- Overhauled C++ tokenizer to use a much better implementation
+- Added `libassert::enable_virtual_terminal_processing_if_needed()` to the public interface
+- Added `libassert::isatty` to the public interface as well as stdin/stdout/stderr constants
+- Renamed `libassert::generate_stringification` to `libassert::stringify`
+- Added setting for output separator with `libassert::set_separator`
+- Updated parameter passing for `libassert::set_color_scheme`
+- Updated `libassert::stacktrace` to take color scheme and skip parameters
+- Added C++23 specialization for how static assertion information is stored which is hopefully faster for compile times
+- Added `LIBASSERT_PREFIX_ASSERTIONS` option to only add assertion macros with a `LIBASSERT_` prefix
+- Added normalization for msvc ``​`anonymous namespace'``
+- Added `LIBASSERT_NO_STRINGIFY_SMART_POINTER_OBJECTS` option
+- Improved how data is stored in `binary_diagnostics_descriptor`, `assert_static_parameters`, and `assertion_info`
+- Simplified up failure handler signature
+- Added limit to the number of items stringified for containers
+- Resolved long-standing bug related to libc++'s std::regex implementation
+- Added methods for getting parts of assertion info outputs for easier custom failure handler implementation
+- Improved internal argument processing
+- Cmake fixes and improvements
+
 ## libassert 2.0.0-alpha
 
 This is the first pre-release for version 2. Version 2 is an overhaul of the library taking lessons learned.

CMakeLists.txt

@@ -21,6 +21,13 @@ project(
 include(cmake/ProjectIsTopLevel.cmake)
 include(cmake/OptionVariables.cmake)
 
+if(PROJECT_IS_TOP_LEVEL)
+  find_program(CCACHE_FOUND ccache)
+  if(CCACHE_FOUND)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+  endif()
+endif()
+
 if(PROJECT_IS_TOP_LEVEL)
   if(CMAKE_GENERATOR STREQUAL "Ninja")
     if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
@@ -43,7 +50,7 @@ set(LIBASSERT_MAGIC_ENUM_REPO "https://github.com/Neargye/magic_enum.git")
 set(LIBASSERT_MAGIC_ENUM_TAG "e55b9b54d5cf61f8e117cafb17846d7d742dd3b4") # v0.9.5
 
 set(LIBASSERT_CPPTRACE_REPO "https://github.com/jeremy-rifkin/cpptrace.git")
-set(LIBASSERT_CPPTRACE_TAG "7fda402638875e6a265ba5e6ed376dcee4bd29fa") # v0.4.0
+set(LIBASSERT_CPPTRACE_TAG "58992cbeb6417764ceb190ad40d1207d929f1402") # v0.4.1
 
 # obtain cpptrace
 if(LIBASSERT_USE_EXTERNAL_CPPTRACE)
@@ -94,6 +101,7 @@ target_sources(
   src/platform.cpp
   src/printing.cpp
   src/paths.cpp
+  src/tokenizer.cpp
 )
 
 # link dependencies
@@ -150,7 +158,7 @@ target_compile_features(
   PUBLIC cxx_std_17
 )
 
-if(LIBSANITIZER_BUILD)
+if(LIBASSERT_SANITIZER_BUILD)
   add_compile_options(-fsanitize=address)
   add_link_options(-fsanitize=address)
 endif()
@@ -198,6 +206,11 @@ if(LIBASSERT_BUILD_TESTING)
       enable_testing()
   endif()
 
+  target_compile_definitions(
+    ${target_name} PUBLIC
+    LIBASSERT_BUILD_TESTING
+  )
+
   # tell unit tests where our files are
   set(LIBASSERT_BINARY_DIR "${PROJECT_BINARY_DIR}")
   set(LIBASSERT_SOURCE_DIR "${PROJECT_SOURCE_DIR}")