Add fallback for old cpptrace versions that don't provide <cpptrace/b…

…asic.hpp>
jeremy-rifkin · Dec 22, 2024 · 1bf749d · 1bf749d
1 parent ea0c1a9
commit 1bf749d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/include/libassert/assert.hpp b/include/libassert/assert.hpp
@@ -25,7 +25,11 @@
 #include <libassert/stringification.hpp>
 #include <libassert/expression-decomposition.hpp>
 
-#include <cpptrace/basic.hpp>
+#if defined(__has_include) && __has_include(<cpptrace/basic.hpp>)
+ #include <cpptrace/basic.hpp>
+#else
+ #include <cpptrace/cpptrace.hpp>
+#endif
 
 #ifdef __cpp_lib_expected
  #include <expected>

diff --git a/src/assert.cpp b/src/assert.cpp
@@ -23,8 +23,12 @@
 #include <utility>
 #include <vector>
 
-#include <cpptrace/basic.hpp>
-#include <cpptrace/exceptions.hpp>
+#if defined(__has_include) && __has_include(<cpptrace/basic.hpp>)
+ #include <cpptrace/basic.hpp>
+ #include <cpptrace/exceptions.hpp>
+#else
+ #include <cpptrace/cpptrace.hpp>
+#endif
 
 #include "common.hpp"
 #include "utils.hpp"

diff --git a/src/utils.cpp b/src/utils.cpp
@@ -8,8 +8,13 @@
 #include <vector>
 
 #include <libassert/assert.hpp>
-#include <cpptrace/basic.hpp>
-#include <cpptrace/exceptions.hpp>
+
+#if defined(__has_include) && __has_include(<cpptrace/basic.hpp>)
+ #include <cpptrace/basic.hpp>
+ #include <cpptrace/exceptions.hpp>
+#else
+ #include <cpptrace/cpptrace.hpp>
+#endif
 
 #include "utils.hpp"
 #include "microfmt.hpp"