Skip to content
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

Fix compilation with backtraces disabled part 2 #1196

Merged
merged 1 commit into from
Jul 4, 2024
Merged

Fix compilation with backtraces disabled part 2 #1196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions libs/pika/debugging/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

set(debugging_headers
pika/debugging/attach_debugger.hpp pika/debugging/backtrace.hpp
pika/debugging/backtrace/backtrace.hpp pika/debugging/demangle_helper.hpp
pika/debugging/demangle_helper.hpp pika/debugging/detail/backtrace.hpp
pika/debugging/environ.hpp pika/debugging/print.hpp
)

Expand All @@ -18,7 +18,6 @@ pika_add_module(
GLOBAL_HEADER_GEN ON
SOURCES ${debugging_sources}
HEADERS ${debugging_headers}
EXCLUDE_FROM_GLOBAL_HEADER "pika/debugging/backtrace/backtrace.hpp"
MODULE_DEPENDENCIES pika_config
CMAKE_SUBDIRS examples tests
)
2 changes: 1 addition & 1 deletion libs/pika/debugging/include/pika/debugging/backtrace.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <pika/config.hpp>

#if defined(PIKA_HAVE_STACKTRACES)
# include <pika/debugging/backtrace/backtrace.hpp>
# include <pika/debugging/detail/backtrace.hpp>
#else

# include <cstddef>
Expand Down
0 ...de/pika/debugging/backtrace/backtrace.hpp → ...clude/pika/debugging/detail/backtrace.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion libs/pika/debugging/src/backtrace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#if defined(PIKA_HAVE_STACKTRACES)

# include <pika/debugging/backtrace/backtrace.hpp>
# include <pika/debugging/detail/backtrace.hpp>

# if (defined(__linux) || defined(__APPLE__) || defined(__sun)) && \
(!defined(__ANDROID__) || !defined(ANDROID))
Expand Down
2 changes: 1 addition & 1 deletion libs/pika/lock_registration/src/register_locks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <pika/config.hpp>
#include <pika/assert.hpp>
#include <pika/debugging/backtrace/backtrace.hpp>
#include <pika/debugging/backtrace.hpp>
#include <pika/lock_registration/detail/register_locks.hpp>
#include <pika/modules/errors.hpp>
#include <pika/type_support/unused.hpp>
Expand Down
Loading