From 95d39cd204b6aa010a513a04984148586e6a1267 Mon Sep 17 00:00:00 2001
From: ekoby <7406535+ekoby@users.noreply.github.com>
Date: Tue, 23 May 2023 10:37:16 -0400
Subject: [PATCH] bump ziti-sdk@0.32.5 (#664)

* bump ziti-sdk@0.32.5

add CMake option to use local ziti-sdk-c checkout

* update ziti-sdk@0.32.6
---
 CMakeLists.txt      |  8 ++++----
 deps/CMakeLists.txt | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5dacb22d..9d0fec10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.20)
-if(NOT ZITI_SDK_C_BRANCH)
-    #allow using a different branch of the CSDK easily
-    set(ZITI_SDK_C_BRANCH 0.32.3)
-endif()
+
+
+set(ZITI_SDK_DIR "" CACHE FILEPATH "developer option: use local ziti-sdk-c checkout")
+set(ZITI_SDK_VERSION "0.32.6" CACHE STRING "ziti-sdk-c version or branch to use")
 
 # if TUNNEL_SDK_ONLY then don't descend into programs/ziti-edge-tunnel
 option(TUNNEL_SDK_ONLY "build only ziti-tunnel-sdk (without ziti)" OFF)
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index 3d0a8f7a..c0b5eeed 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -2,13 +2,17 @@ include(FetchContent)
 
 if(NOT TUNNEL_SDK_ONLY)
 
-FetchContent_Declare(ziti-sdk-c
-        GIT_REPOSITORY https://github.com/openziti/ziti-sdk-c.git
-        GIT_TAG ${ZITI_SDK_C_BRANCH}
-        )
-set(ZITI_BUILD_TESTS off)
-set(ZITI_BUILD_PROGRAMS off)
-FetchContent_MakeAvailable(ziti-sdk-c)
+    if (ZITI_SDK_DIR)
+        add_subdirectory(${ZITI_SDK_DIR} ${CMAKE_CURRENT_BINARY_DIR}/ziti-sdk)
+    else ()
+        FetchContent_Declare(ziti-sdk-c
+                GIT_REPOSITORY https://github.com/openziti/ziti-sdk-c.git
+                GIT_TAG ${ZITI_SDK_VERSION}
+                )
+        set(ZITI_BUILD_TESTS off)
+        set(ZITI_BUILD_PROGRAMS off)
+        FetchContent_MakeAvailable(ziti-sdk-c)
+    endif ()
 
 endif()