Fix stacktrace_from_exception CMake builds (#191)

boostorg · Oct 17, 2024 · 088bf8e · 088bf8e
1 parent 344f6ba
commit 088bf8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -103,7 +103,6 @@ stacktrace_add_library(addr2line ${BOOST_STACKTRACE_ENABLE_ADDR2LINE} "${CMAKE_D
 stacktrace_add_library(basic ${BOOST_STACKTRACE_ENABLE_BASIC} "${CMAKE_DL_LIBS}" "")
 stacktrace_add_library(windbg ${BOOST_STACKTRACE_ENABLE_WINDBG} "dbgeng;ole32" "_GNU_SOURCE=1")
 stacktrace_add_library(windbg_cached ${BOOST_STACKTRACE_ENABLE_WINDBG_CACHED} "dbgeng;ole32" "_GNU_SOURCE=1")
-stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS}" "")
 
 # boost_stacktrace, default library
 
@@ -134,11 +133,8 @@ elseif(BOOST_STACKTRACE_ENABLE_NOOP)
 
 endif()
 
-if(BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION)
-
-  target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_from_exception)
-
-endif()
+# Boost::stacktrace_from_exception is never the default
+stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS};boost_stacktrace" "")
 
 #
 

diff --git a/src/from_exception.cpp b/src/from_exception.cpp
@@ -4,8 +4,6 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#define BOOST_STACKTRACE_INTERNAL_BUILD_LIBS
-
 #if defined(_MSC_VER)
 
 #include <boost/stacktrace/safe_dump_to.hpp>