Fetch zstd as standalone lib (#192)
Reviewed-on: https://git.madvoxel.net/OpenVulkano/OpenVulkano/pulls/192 Reviewed-by: Georg Hagen <georg.hagen@madvoxel.com> Co-authored-by: ohyzha <oleksii.hyzha.ext@madvoxel.com> Co-committed-by: ohyzha <oleksii.hyzha.ext@madvoxel.com>
This commit is contained in:
3
3rdParty/libarchive/CMakeLists.txt
vendored
3
3rdParty/libarchive/CMakeLists.txt
vendored
@@ -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)
|
||||
|
||||
@@ -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})
|
||||
|
||||
Reference in New Issue
Block a user