From c997ca2b60e50b54e53b5910aaa1f3121cec1fb7 Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Mon, 28 Aug 2023 13:13:35 -0300 Subject: [PATCH] Don't rely on cmake search path for StaticBuild Resolves a conflict with libquic's StaticBuild. --- CMakeLists.txt | 2 +- external/oxen-libquic | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c775c1626..bd67b5ac1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ if(BUILD_STATIC_DEPS AND NOT STATIC_LINK) endif() if(BUILD_STATIC_DEPS) set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE) - include(StaticBuild) + include(cmake/StaticBuild.cmake) endif() if(NOT CMAKE_BUILD_TYPE) diff --git a/external/oxen-libquic b/external/oxen-libquic index 15821c53f..0fdbb2c8a 160000 --- a/external/oxen-libquic +++ b/external/oxen-libquic @@ -1 +1 @@ -Subproject commit 15821c53fc0f261537bca89387268eea84e1f1c5 +Subproject commit 0fdbb2c8ad20a729979465cf3c4f625c9c88fe04