From a106bc468065369c556266b6fa245d6ddd09ea20 Mon Sep 17 00:00:00 2001 From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com> Date: Tue, 21 Nov 2023 15:17:38 -0600 Subject: [PATCH] Use libdwarf::libdwarf on conan --- CMakeLists.txt | 6 +++++- cmake/OptionVariables.cmake | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cdbaa7..39a3bcc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -347,7 +347,11 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF) ) FetchContent_MakeAvailable(libdwarf) endif() - target_link_libraries(${target_name} PRIVATE libdwarf::dwarf-static) + if(CPPTRACE_CONAN) + target_link_libraries(${target_name} PRIVATE libdwarf::libdwarf) + else() + target_link_libraries(${target_name} PRIVATE libdwarf::dwarf-static) + endif() if(UNIX) target_link_libraries(${target_name} PRIVATE ${CMAKE_DL_LIBS}) endif() diff --git a/cmake/OptionVariables.cmake b/cmake/OptionVariables.cmake index 3a6cdaa..526be9c 100644 --- a/cmake/OptionVariables.cmake +++ b/cmake/OptionVariables.cmake @@ -158,6 +158,7 @@ if(PROJECT_IS_TOP_LEVEL) endif() option(CPPTRACE_USE_EXTERNAL_LIBDWARF "" OFF) +option(CPPTRACE_CONAN "" OFF) option(CPPTRACE_SANITIZER_BUILD "" OFF) mark_as_advanced( @@ -165,4 +166,5 @@ mark_as_advanced( CPPTRACE_ADDR2LINE_PATH CPPTRACE_ADDR2LINE_SEARCH_SYSTEM_PATH CPPTRACE_SANITIZER_BUILD + CPPTRACE_CONAN )