Skip to content

Commit 088bf8e

Browse files
authored
Fix stacktrace_from_exception CMake builds (#191)
1 parent 344f6ba commit 088bf8e

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

CMakeLists.txt

+2-6
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ stacktrace_add_library(addr2line ${BOOST_STACKTRACE_ENABLE_ADDR2LINE} "${CMAKE_D
103103
stacktrace_add_library(basic ${BOOST_STACKTRACE_ENABLE_BASIC} "${CMAKE_DL_LIBS}" "")
104104
stacktrace_add_library(windbg ${BOOST_STACKTRACE_ENABLE_WINDBG} "dbgeng;ole32" "_GNU_SOURCE=1")
105105
stacktrace_add_library(windbg_cached ${BOOST_STACKTRACE_ENABLE_WINDBG_CACHED} "dbgeng;ole32" "_GNU_SOURCE=1")
106-
stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS}" "")
107106

108107
# boost_stacktrace, default library
109108

@@ -134,11 +133,8 @@ elseif(BOOST_STACKTRACE_ENABLE_NOOP)
134133

135134
endif()
136135

137-
if(BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION)
138-
139-
target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_from_exception)
140-
141-
endif()
136+
# Boost::stacktrace_from_exception is never the default
137+
stacktrace_add_library(from_exception ${BOOST_STACKTRACE_ENABLE_FROM_EXCEPTION} "${CMAKE_DL_LIBS};boost_stacktrace" "")
142138

143139
#
144140

src/from_exception.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// accompanying file LICENSE_1_0.txt or copy at
55
// http://www.boost.org/LICENSE_1_0.txt)
66

7-
#define BOOST_STACKTRACE_INTERNAL_BUILD_LIBS
8-
97
#if defined(_MSC_VER)
108

119
#include <boost/stacktrace/safe_dump_to.hpp>

0 commit comments

Comments
 (0)