From 5e65ccecc0fa61efe9ab244d337d297d85a667e3 Mon Sep 17 00:00:00 2001
From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com>
Date: Sun, 4 Feb 2024 14:35:49 -0600
Subject: [PATCH] Add external zstd option

---
 CMakeLists.txt              | 10 +++++++---
 cmake/OptionVariables.cmake |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 619f33b..8096487 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,9 +338,9 @@ endif()
 
 if(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(libdwarf REQUIRED)
   else()
     include(FetchContent)
     cmake_policy(SET CMP0074 NEW)
@@ -363,7 +363,11 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
       set(ZSTD_LEGACY_SUPPORT OFF)
       add_subdirectory("${zstd_SOURCE_DIR}/build/cmake" "${zstd_BINARY_DIR}")
     endif()
-
+  endif()
+  # Libdwarf itself
+  if(CPPTRACE_USE_EXTERNAL_LIBDWARF)
+    find_package(libdwarf REQUIRED)
+  else()
     set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
     # set(PIC_ALWAYS TRUE)
     # set(BUILD_DWARFDUMP FALSE)
diff --git a/cmake/OptionVariables.cmake b/cmake/OptionVariables.cmake
index 6a4a3c6..4e2ea6f 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_USE_EXTERNAL_ZSTD "" OFF)
 option(CPPTRACE_CONAN "" OFF)
 option(CPPTRACE_VCPKG "" OFF)
 option(CPPTRACE_SANITIZER_BUILD "" OFF)