Skip to content

Fix stacktrace_from_exception builds #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Oct 17, 2024
Merged

Fix stacktrace_from_exception builds #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7a1b843
Fix stacktrace_from_exception builds
apolukhin Oct 17, 2024
3718020
fix attempt
apolukhin Oct 17, 2024
b601637
fixes
apolukhin Oct 17, 2024
ec93d28
fixes
apolukhin Oct 17, 2024
3b829ae
fixes
apolukhin Oct 17, 2024
5f4cb38
fix attempt
apolukhin Oct 17, 2024
bcb985c
fix attempt
apolukhin Oct 17, 2024
34f33af
fix attempt
apolukhin Oct 17, 2024
7386391
fix attempt
apolukhin Oct 17, 2024
f8f3d9b
fix attempt
apolukhin Oct 17, 2024
19ba6e3
fix attempt
apolukhin Oct 17, 2024
9c6ea61
cleanup
apolukhin Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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" "")

#

Expand Down
2 changes: 0 additions & 2 deletions src/from_exception.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading