Fix stacktrace_from_exception CMake builds (#191 )

Always link boost_stacktrace/Boost::stacktrace with Boost::stacktrace_from_exception if it is awailable in CMake
Add CMake target boost_stacktrace_from_exception (#189 )
2026-01-29 08:02:09 +00:00 · 2024-10-17 11:57:19 +03:00 · 2024-10-16 15:13:44 +03:00 · 2024-10-16 15:11:09 +03:00 · 2024-09-15 19:03:09 +03:00 · 2024-09-13 20:42:31 +03:00
6 changed files with 46 additions and 18 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,14 +71,21 @@ endif()
 stacktrace_check(BOOST_STACKTRACE_HAS_WINDBG has_windbg.cpp "" "dbgeng;ole32" "")
 stacktrace_check(BOOST_STACKTRACE_HAS_WINDBG_CACHED has_windbg_cached.cpp "${CMAKE_CURRENT_SOURCE_DIR}/../config/include" "dbgeng;ole32" "")

+set(_default_from_exception ON)
+if (NOT CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64|amd64|i386|i686|x86")
+  set(_default_from_exception OFF)
+endif()
+
 option(BOOST_STACKTRACE_ENABLE_NOOP "Boost.Stacktrace: build boost_stacktrace_noop" ON)
 option(BOOST_STACKTRACE_ENABLE_BACKTRACE "Boost.Stacktrace: build boost_stacktrace_backtrace" ${BOOST_STACKTRACE_HAS_BACKTRACE})
 option(BOOST_STACKTRACE_ENABLE_ADDR2LINE "Boost.Stacktrace: build boost_stacktrace_addr2line" ${_default_addr2line})
 option(BOOST_STACKTRACE_ENABLE_BASIC "Boost.Stacktrace: build boost_stacktrace_basic" ON)
 option(BOOST_STACKTRACE_ENABLE_WINDBG "Boost.Stacktrace: build boost_stacktrace_windbg" ${BOOST_STACKTRACE_HAS_WINDBG})
 option(BOOST_STACKTRACE_ENABLE_WINDBG_CACHED "Boost.Stacktrace: build boost_stacktrace_windbg_cached" ${BOOST_STACKTRACE_HAS_WINDBG_CACHED})
+option(BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION "Boost.Stacktrace: build boost_stacktrace_from_exception" ${_default_from_exception})

 unset(_default_addr2line)
+unset(_default_from_exception)

 message(STATUS "Boost.Stacktrace: "
  "noop ${BOOST_STACKTRACE_ENABLE_NOOP}, "
@@ -86,7 +93,8 @@ message(STATUS "Boost.Stacktrace: "
  "addr2line ${BOOST_STACKTRACE_ENABLE_ADDR2LINE}, "
  "basic ${BOOST_STACKTRACE_ENABLE_BASIC}, "
  "windbg ${BOOST_STACKTRACE_ENABLE_WINDBG}, "
-  "windbg_cached ${BOOST_STACKTRACE_ENABLE_WINDBG_CACHED}"
+  "windbg_cached ${BOOST_STACKTRACE_ENABLE_WINDBG_CACHED}, "
+  "from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION}"
 )

 stacktrace_add_library(noop ${BOOST_STACKTRACE_ENABLE_NOOP} "" "")
@@ -125,6 +133,9 @@ elseif(BOOST_STACKTRACE_ENABLE_NOOP)

 endif()

+# Boost::stacktrace_from_exception is never the default
+stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS};boost_stacktrace" "")
+
 #

 if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
--- a/include/boost/stacktrace/frame.hpp
+++ b/include/boost/stacktrace/frame.hpp
@@ -20,6 +20,20 @@
 #include <boost/stacktrace/detail/frame_decl.hpp>
 #include <boost/stacktrace/detail/push_options.h>

+#if defined(BOOST_MSVC) && (defined(BOOST_STACKTRACE_INTERNAL_BUILD_LIBS) || !defined(BOOST_STACKTRACE_LINK))
+extern "C" {
+
+#if defined(BOOST_STACKTRACE_DYN_LINK)
+BOOST_SYMBOL_EXPORT
+#elif defined(BOOST_STACKTRACE_LINK)
+#else
+BOOST_SYMBOL_EXPORT inline
+#endif
+void* boost_stacktrace_impl_return_nullptr() { return nullptr; }
+
+}
+#endif
+
 namespace boost { namespace stacktrace {

 /// Comparison operators that provide platform dependant ordering and have O(1) complexity; are Async-Handler-Safe.
--- a/include/boost/stacktrace/stacktrace.hpp
+++ b/include/boost/stacktrace/stacktrace.hpp
@@ -37,7 +37,6 @@

 extern "C" {

-BOOST_SYMBOL_EXPORT inline void* boost_stacktrace_impl_return_nullptr() { return nullptr; }
 const char* boost_stacktrace_impl_current_exception_stacktrace();
 bool* boost_stacktrace_impl_ref_capture_stacktraces_at_throw();

--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -188,6 +188,8 @@ test-suite stacktrace_tests
    [ run test_void_ptr_cast.cpp ]
    [ run test_num_conv.cpp ]

+    [ run test_from_exception_none.cpp : : : $(LINKSHARED_NOOP) <debug-symbols>on                                   : from_exception_none_noop ]
+    [ run test_from_exception_none.cpp : : : <define>BOOST_STACKTRACE_USE_NOOP $(NOOP_DEPS) <debug-symbols>on       : from_exception_none_noop_ho ]
    [ run test_from_exception_none.cpp : : : $(LINKSHARED_BASIC) <debug-symbols>on                                  : from_exception_none_basic ]
    [ run test_from_exception_none.cpp : : : $(FORCE_SYMBOL_EXPORT) $(BASIC_DEPS) <debug-symbols>on                 : from_exception_none_basic_ho ]
    [ run test_from_exception_none.cpp : : : $(LINKSHARED_BT) <debug-symbols>on                                     : from_exception_none_bt ]
@@ -197,6 +199,8 @@ test-suite stacktrace_tests
    [ run test_from_exception_none.cpp : : : $(LINKSHARED_WIND_CACHED) <debug-symbols>on                               : from_exception_none_windbg_cached ]
    [ run test_from_exception_none.cpp : : : <define>BOOST_STACKTRACE_USE_WINDBG_CACHED $(WICA_DEPS) <debug-symbols>on : from_exception_none_windbg_cached_ho ]

+    [ run test_from_exception_none.cpp : : : <library>/boost/stacktrace//boost_stacktrace_from_exception $(LINKSHARED_NOOP) <debug-symbols>on                        : from_exception_disabled_none ]
+    [ run test_from_exception_none.cpp : : : <library>/boost/stacktrace//boost_stacktrace_from_exception <define>BOOST_STACKTRACE_USE_NOOP $(NOOP_DEPS)              : from_exception_disabled_none_ho ]
    [ run test_from_exception_none.cpp : : : <library>/boost/stacktrace//boost_stacktrace_from_exception $(LINKSHARED_BASIC) <debug-symbols>on                       : from_exception_disabled_basic ]
    [ run test_from_exception_none.cpp : : : <library>/boost/stacktrace//boost_stacktrace_from_exception $(FORCE_SYMBOL_EXPORT) $(BASIC_DEPS) <debug-symbols>on      : from_exception_disabled_basic_ho ]
    [ run test_from_exception_none.cpp : : : <library>/boost/stacktrace//boost_stacktrace_from_exception $(LINKSHARED_BT) <debug-symbols>on                          : from_exception_disabled_bt ]
--- a/test/appveyor.yml
+++ b/test/appveyor.yml
@@ -36,23 +36,23 @@ environment:
      TOOLSET: msvc-14.1 #,clang-win
      CXXSTD: 14,17
      ADDRMD: 64
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      ADDPATH: C:\cygwin\bin;
-      TOOLSET: gcc
-      CXXSTD: 11,14,1z
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      ADDPATH: C:\cygwin64\bin;
-      TOOLSET: gcc
-      CXXSTD: 11,14,1z
+    #- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    #  ADDPATH: C:\cygwin\bin;
+    #  TOOLSET: gcc
+    #  CXXSTD: 03,11,14,1z
+    #- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    #  ADDPATH: C:\cygwin64\bin;
+    #  TOOLSET: gcc
+    #  CXXSTD: 03,11,14,1z
    # Waiting for https://github.com/boostorg/system/issues/116
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      ADDPATH: C:\mingw\bin;
-      TOOLSET: gcc
-      CXXSTD: 11,14,1z
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      ADDPATH: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;
-      TOOLSET: gcc
-      CXXSTD: 03,11,14,1z
+    #- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    #  ADDPATH: C:\mingw\bin;
+    #  TOOLSET: gcc
+    #  CXXSTD: 03,11,14,1z
+    #- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    #  ADDPATH: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;
+    #  TOOLSET: gcc
+    #  CXXSTD: 03,11,14,1z

 before_build:
    - set BOOST_BRANCH=develop
--- a/test/backtrace.dump
+++ b/test/backtrace.dump
Author	SHA1	Message	Date
Antony Polukhin	088bf8ed7f	Fix stacktrace_from_exception CMake builds (#191 )	2024-10-17 11:57:19 +03:00
Antony Polukhin	344f6bae19	Always link boost_stacktrace/Boost::stacktrace with Boost::stacktrace_from_exception if it is awailable in CMake	2024-10-16 15:13:44 +03:00
int mian	6504ed9ea4	Add CMake target boost_stacktrace_from_exception (#189 ) Fixes #188	2024-10-16 15:11:09 +03:00
Antony Polukhin	a778e3d223	cleanup	2024-09-15 19:03:09 +03:00
huangqinjin	464e224c2f	Don't export boost_stacktrace_impl_return_nullptr for static build (#186 ) Now `boost_stacktrace.lib` provides the symbol `boost_stacktrace_impl_return_nullptr` for static and shared build. For header only library, to make the symbol available automatically, the only way AFAIK is to export it. We may also consider provide a configuration macro to opt-out the exported symbol, and user need to manually define the non-exported symbol somewhere in their binaries. Closes #177 .	2024-09-13 20:42:31 +03:00
Antony Polukhin	3f79aee92f	Revert fix attempt for #177	2024-09-12 22:27:45 +03:00
Antony Polukhin	da94896d2d	Fix attempt for #177	2024-09-12 22:00:21 +03:00