From c161293e89a0ef4428a298eea3ad125fffdc8ef5 Mon Sep 17 00:00:00 2001
From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com>
Date: Sun, 4 Feb 2024 00:17:25 -0600
Subject: [PATCH] Update for zstd target handling again

---
 .github/workflows/build.yml |  6 +++---
 .github/workflows/test.yml  |  6 +++---
 CMakeLists.txt              | 11 +----------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 77140c5..cd32829 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f590624..553a20d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6203e9a..619f33b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)