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

Update for zstd target handling again

Browse Source
This commit is contained in:
Jeremy 2024-02-04 00:17:25 -06:00
parent ab9a832a30
commit c161293e89
No known key found for this signature in database
GPG Key ID: BE03111EB7ED6E2E
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@ -33,7 +33,7 @@ jobs:
cd libdwarf
git init
git remote add origin https://github.com/jeremy-rifkin/libdwarf-code.git
git fetch --depth 1 origin 2d8b0a15349ca634b212a11f2b2a97b9a85890a3
git fetch --depth 1 origin 308b55331b564d4fdbe3bc6856712270e5b2395b
git checkout FETCH_HEAD
mkdir build
cd build
@ -71,7 +71,7 @@ jobs:
cd libdwarf
git init
git remote add origin https://github.com/jeremy-rifkin/libdwarf-code.git
git fetch --depth 1 origin 2d8b0a15349ca634b212a11f2b2a97b9a85890a3
git fetch --depth 1 origin 308b55331b564d4fdbe3bc6856712270e5b2395b
git checkout FETCH_HEAD
mkdir build
cd build
@ -116,7 +116,7 @@ jobs:
cd libdwarf
git init
git remote add origin https://github.com/jeremy-rifkin/libdwarf-code.git
git fetch --depth 1 origin 2d8b0a15349ca634b212a11f2b2a97b9a85890a3
git fetch --depth 1 origin 308b55331b564d4fdbe3bc6856712270e5b2395b
git checkout FETCH_HEAD
mkdir build
cd build

6
.github/workflows/test.yml vendored
View File

@ -36,7 +36,7 @@ jobs:
cd libdwarf
git init
git remote add origin https://github.com/jeremy-rifkin/libdwarf-code.git
git fetch --depth 1 origin 2d8b0a15349ca634b212a11f2b2a97b9a85890a3
git fetch --depth 1 origin 308b55331b564d4fdbe3bc6856712270e5b2395b
git checkout FETCH_HEAD
mkdir build
cd build
@ -72,7 +72,7 @@ jobs:
cd libdwarf
git init
git remote add origin https://github.com/jeremy-rifkin/libdwarf-code.git
git fetch --depth 1 origin 2d8b0a15349ca634b212a11f2b2a97b9a85890a3
git fetch --depth 1 origin 308b55331b564d4fdbe3bc6856712270e5b2395b
git checkout FETCH_HEAD
mkdir build
cd build
@ -132,7 +132,7 @@ jobs:
cd libdwarf
git init
git remote add origin https://github.com/jeremy-rifkin/libdwarf-code.git
git fetch --depth 1 origin 2d8b0a15349ca634b212a11f2b2a97b9a85890a3
git fetch --depth 1 origin 308b55331b564d4fdbe3bc6856712270e5b2395b
git checkout FETCH_HEAD
mkdir build
cd build

11
CMakeLists.txt
View File

@ -340,10 +340,6 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
target_compile_definitions(${target_name} PUBLIC CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
if(CPPTRACE_USE_EXTERNAL_LIBDWARF)
find_package(zstd)
if(TARGET libzstd_static)
add_library(ZSTD::ZSTD ALIAS libzstd_static)
set(ZSTD_FOUND TRUE)
endif()
find_package(libdwarf REQUIRED)
else()
include(FetchContent)
@ -368,11 +364,6 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
add_subdirectory("${zstd_SOURCE_DIR}/build/cmake" "${zstd_BINARY_DIR}")
endif()
# if(TARGET libzstd_static)
# add_library(ZSTD::ZSTD ALIAS libzstd_static)
# set(ZSTD_FOUND TRUE)
# endif()
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
# set(PIC_ALWAYS TRUE)
# set(BUILD_DWARFDUMP FALSE)
@ -388,7 +379,7 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
# GIT_TAG c78e984f3abbd20f6e01d6f51819e826b1691f65 # v0.8.0
# GIT_TAG 71090c680b4c943448ba87a0f1f864f174e4edda # v0.9.0
GIT_REPOSITORY https://github.com/jeremy-rifkin/libdwarf-code.git
GIT_TAG 2d8b0a15349ca634b212a11f2b2a97b9a85890a3
GIT_TAG 308b55331b564d4fdbe3bc6856712270e5b2395b
GIT_SHALLOW 1
)
# FetchContent_MakeAvailable(libdwarf)