luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup CPPTRACE_USE_SYSTEM_LIBDWARF and add note to the README. TODO for some reason the include path still doesn't work.

Browse Source
This commit is contained in:
Jeremy 2023-09-24 03:49:35 -04:00
parent c94b03ae6e
commit edf55395d7
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -314,10 +314,7 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
target_compile_definitions(cpptrace PUBLIC CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF) target_compile_definitions(cpptrace PUBLIC CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
if(CPPTRACE_USE_SYSTEM_LIBDWARF) if(CPPTRACE_USE_SYSTEM_LIBDWARF)
find_package(libdwarf REQUIRED) find_package(libdwarf REQUIRED)
target_link_libraries(cpptrace PRIVATE libdwarf::libdwarf) target_link_libraries(cpptrace PRIVATE libdwarf)
# TODO: Temp hack
#target_include_directories(cpptrace PRIVATE "${CMAKE_INSTALL_INCLUDEDIR}/libdwarf")
target_include_directories(cpptrace PRIVATE "/usr/local/include/libdwarf/")
else() else()
add_subdirectory(bundled/libdwarf) add_subdirectory(bundled/libdwarf)
target_link_libraries(cpptrace PRIVATE dwarf) target_link_libraries(cpptrace PRIVATE dwarf)

1
README.md
View File

@ -545,6 +545,7 @@ Back-end configuration:
injection). injection).
- `CPPTRACE_ADDR2LINE_SEARCH_SYSTEM_PATH=On/Off`: Specifies whether cpptrace should let the system search the PATH - `CPPTRACE_ADDR2LINE_SEARCH_SYSTEM_PATH=On/Off`: Specifies whether cpptrace should let the system search the PATH
environment variable directories for the binary. environment variable directories for the binary.
- `CPPTRACE_USE_SYSTEM_LIBDWARF=On/Off`: Use libdwarf resolved via `find_package` rather than the bundled libdwarf.
Testing: Testing:
- `CPPTRACE_BUILD_TEST` Build a small test program - `CPPTRACE_BUILD_TEST` Build a small test program