Skip to content

Fix configuration errors when using external Boost #8

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

Open
jbelloncastro wants to merge 1 commit into
base: dyninst_13
Choose a base branch
from
Open

Fix configuration errors when using external Boost #8

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
2 changes: 2 additions & 0 deletions cmake/tpls/DyninstBoost.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ if(NOT TARGET Dyninst::Boost)
target_include_directories(Dyninst::Boost SYSTEM INTERFACE ${Boost_INCLUDE_DIRS})
target_compile_definitions(Dyninst::Boost
INTERFACE BOOST_MULTI_INDEX_DISABLE_SERIALIZATION)
endif()

if(NOT TARGET Dyninst::Boost_headers)
# Just the headers (effectively a simplified Boost::headers target)
add_library(Dyninst::Boost_headers INTERFACE IMPORTED)
target_include_directories(Dyninst::Boost_headers SYSTEM
Expand Down
3 changes: 2 additions & 1 deletion common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include_guard(GLOBAL)

include(DyninstLibrary)
include(DyninstBoost)

configure_file(${PROJECT_SOURCE_DIR}/cmake/dyninstversion.h.in
${CMAKE_CURRENT_SOURCE_DIR}/h/dyninstversion.h)
Expand Down Expand Up @@ -165,7 +166,7 @@ dyninst_library(
PRIVATE_HEADER_FILES ${_private_headers}
SOURCE_FILES ${_sources}
DEFINES COMMON_LIB
PUBLIC_DEPS Dyninst::TBB Dyninst::Boost
PUBLIC_DEPS Dyninst::TBB Dyninst::Boost Boost::thread Boost::filesystem
PRIVATE_DEPS Dyninst::LibIberty OpenMP::OpenMP_CXX Dyninst::Valgrind Threads::Threads
)
# cmake-format: on
Expand Down
1 change: 1 addition & 0 deletions dwarf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include_guard(GLOBAL)

include(DyninstLibrary)
include(DyninstBoost)

if(NOT DYNINST_OS_UNIX)
if(NOT TARGET dynDwarf)
Expand Down
1 change: 1 addition & 0 deletions dyninstAPI/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ if(LIGHTWEIGHT_SYMTAB)
endif()

include(DyninstLibrary)
include(DyninstBoost)

set(_public_headers
h/BPatch_addressSpace.h
Expand Down
1 change: 1 addition & 0 deletions elf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include_guard(GLOBAL)

include(DyninstLibrary)
include(DyninstBoost)

if(NOT DYNINST_OS_UNIX)
if(NOT TARGET dynElf)
Expand Down
1 change: 1 addition & 0 deletions instructionAPI/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include_guard(GLOBAL)

include(DyninstLibrary)
include(DyninstBoost)

set(_sources
src/debug.C
Expand Down
1 change: 1 addition & 0 deletions parseAPI/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include_guard(GLOBAL)

include(DyninstLibrary)
include(DyninstBoost)

set(SRC_LIST
src/ParserDetails.C
Expand Down
1 change: 1 addition & 0 deletions proccontrol/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include_guard(GLOBAL)

include(DyninstLibrary)
include(DyninstBoost)

set(_public_headers
h/Decoder.h
Expand Down
1 change: 1 addition & 0 deletions stackwalk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include_guard(GLOBAL)

include(DyninstLibrary)
include(DyninstBoost)

set(_public_headers
h/basetypes.h
Expand Down