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

Add external zstd option

Browse Source
This commit is contained in:
Jeremy 2024-02-04 14:35:49 -06:00
parent eea0fcd118
commit 5e65ccecc0
No known key found for this signature in database
GPG Key ID: BE03111EB7ED6E2E
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -338,9 +338,9 @@ endif()
if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF) if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
target_compile_definitions(${target_name} PUBLIC CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF) target_compile_definitions(${target_name} PUBLIC CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
if(CPPTRACE_USE_EXTERNAL_LIBDWARF) # First, dependencies: Zstd and zlib (currently relying on system zlib)
if(CPPTRACE_USE_EXTERNAL_ZSTD)
find_package(zstd) find_package(zstd)
find_package(libdwarf REQUIRED)
else() else()
include(FetchContent) include(FetchContent)
cmake_policy(SET CMP0074 NEW) cmake_policy(SET CMP0074 NEW)
@ -363,7 +363,11 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
set(ZSTD_LEGACY_SUPPORT OFF) set(ZSTD_LEGACY_SUPPORT OFF)
add_subdirectory("${zstd_SOURCE_DIR}/build/cmake" "${zstd_BINARY_DIR}") add_subdirectory("${zstd_SOURCE_DIR}/build/cmake" "${zstd_BINARY_DIR}")
endif() endif()
endif()
# Libdwarf itself
if(CPPTRACE_USE_EXTERNAL_LIBDWARF)
find_package(libdwarf REQUIRED)
else()
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
# set(PIC_ALWAYS TRUE) # set(PIC_ALWAYS TRUE)
# set(BUILD_DWARFDUMP FALSE) # set(BUILD_DWARFDUMP FALSE)

1
cmake/OptionVariables.cmake
View File

@ -158,6 +158,7 @@ if(PROJECT_IS_TOP_LEVEL)
endif() endif()
option(CPPTRACE_USE_EXTERNAL_LIBDWARF "" OFF) option(CPPTRACE_USE_EXTERNAL_LIBDWARF "" OFF)
option(CPPTRACE_USE_EXTERNAL_ZSTD "" OFF)
option(CPPTRACE_CONAN "" OFF) option(CPPTRACE_CONAN "" OFF)
option(CPPTRACE_VCPKG "" OFF) option(CPPTRACE_VCPKG "" OFF)
option(CPPTRACE_SANITIZER_BUILD "" OFF) option(CPPTRACE_SANITIZER_BUILD "" OFF)