From b4d8fda9e2911b24891d550a22463cc5c4183fa8 Mon Sep 17 00:00:00 2001 From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com> Date: Fri, 1 Sep 2023 13:09:05 -0400 Subject: [PATCH] Update libdwarf cmake --- CMakeLists.txt | 2 +- bundled/libdwarf/CMakeLists.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df3e4f5..7e0c407 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -331,7 +331,7 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF) target_include_directories(cpptrace PRIVATE "/usr/local/include/libdwarf/") else() add_subdirectory(bundled/libdwarf) - target_link_libraries(cpptrace PRIVATE libdwarf) + target_link_libraries(cpptrace PRIVATE dwarf) endif() if(UNIX) target_link_libraries(cpptrace PRIVATE dl) diff --git a/bundled/libdwarf/CMakeLists.txt b/bundled/libdwarf/CMakeLists.txt index 934d8ec..0ae67cb 100644 --- a/bundled/libdwarf/CMakeLists.txt +++ b/bundled/libdwarf/CMakeLists.txt @@ -426,23 +426,23 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) 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( - libdwarf + dwarf PUBLIC $ ) -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) include(CMakePackageConfigHelpers) install( - TARGETS libdwarf + TARGETS dwarf EXPORT libdwarf_targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}