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

Update libdwarf cmake

Browse Source
This commit is contained in:
Jeremy 2023-09-01 13:09:05 -04:00
parent e3cba004b7
commit b4d8fda9e2
No known key found for this signature in database
GPG Key ID: 3E11861CB34E158C
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -331,7 +331,7 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
target_include_directories(cpptrace PRIVATE "/usr/local/include/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 libdwarf) target_link_libraries(cpptrace PRIVATE dwarf)
endif() endif()
if(UNIX) if(UNIX)
target_link_libraries(cpptrace PRIVATE dl) target_link_libraries(cpptrace PRIVATE dl)

10
bundled/libdwarf/CMakeLists.txt vendored
View File

@ -426,23 +426,23 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
include(GNUInstallDirs) include(GNUInstallDirs)
add_library(libdwarf SHARED ${libdwarf_sources} ${libdwarf_headers}) add_library(dwarf SHARED ${libdwarf_sources} ${libdwarf_headers})
target_compile_definitions(libdwarf PUBLIC LIBDWARF_BUILD) target_compile_definitions(dwarf PUBLIC LIBDWARF_BUILD)
target_include_directories( target_include_directories(
libdwarf dwarf
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
) )
target_link_libraries(libdwarf PUBLIC ${LIBELF_LIBRARIES} ${DW_FZLIB} ${DW_FZSTD}) target_link_libraries(dwarf PUBLIC ${LIBELF_LIBRARIES} ${DW_FZLIB} ${DW_FZSTD})
if(NOT CMAKE_SKIP_INSTALL_RULES) if(NOT CMAKE_SKIP_INSTALL_RULES)
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
install( install(
TARGETS libdwarf TARGETS dwarf
EXPORT libdwarf_targets EXPORT libdwarf_targets
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}