From 90dc67ddb8e0f60a856bb4026e386a4ebc7a6075 Mon Sep 17 00:00:00 2001 From: ohyzha Date: Fri, 24 Jan 2025 17:00:15 +0100 Subject: [PATCH] Fetch zstd as standalone lib (#192) Reviewed-on: https://git.madvoxel.net/OpenVulkano/OpenVulkano/pulls/192 Reviewed-by: Georg Hagen Co-authored-by: ohyzha Co-committed-by: ohyzha --- 3rdParty/libarchive/CMakeLists.txt | 3 +-- cmake/modules/Findzstd.cmake | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/3rdParty/libarchive/CMakeLists.txt b/3rdParty/libarchive/CMakeLists.txt index c507fe9..164d0c7 100644 --- a/3rdParty/libarchive/CMakeLists.txt +++ b/3rdParty/libarchive/CMakeLists.txt @@ -16,7 +16,6 @@ if (NOT LibArchive_FOUND) endif() else () message("Using system LibArchive") - set(USING_SYSTEM_LIBARCHIVE ON PARENT_SCOPE) endif () function(LinkLibArchive TARGET) @@ -27,8 +26,8 @@ function(LinkLibArchive TARGET) endif() set(ZLIB_USE_STATIC_LIBS ON) find_package(ZLIB REQUIRED) + find_package(zstd REQUIRED) find_package(LZ4 QUIET) - find_package(zstd QUIET) find_package(BZip2 QUIET) find_package(LibLZMA QUIET) find_package(LibXml2 QUIET) diff --git a/cmake/modules/Findzstd.cmake b/cmake/modules/Findzstd.cmake index 5fcb037..60c4533 100644 --- a/cmake/modules/Findzstd.cmake +++ b/cmake/modules/Findzstd.cmake @@ -106,7 +106,7 @@ find_library(zstd_SHARED_LIBRARY set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".lib") find_library(zstd_STATIC_LIBRARY - NAMES zstd ${_zstd_win_static_name} + NAMES zstd ${_zstd_win_static_name} zstd_static HINTS ${PC_zstd_LIBDIR} ) set(CMAKE_FIND_LIBRARY_SUFFIXES ${_previous_suffixes})