GerbilSoft/minizip-ng
1
Fork 0
mirror of https://github.com/GerbilSoft/minizip-ng.git synced 2025-06-18 19:45:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed zstd master branch no longer working.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2024-04-01 09:44:11 -07:00
parent 990f512941
commit 5aec551bf7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -197,7 +197,7 @@ if(MZ_ZLIB)
set(PC_PRIVATE_DEPS "zlib") set(PC_PRIVATE_DEPS "zlib")
set(ZLIB_COMPAT ON) set(ZLIB_COMPAT ON)
elseif(MZ_FETCH_LIBS) elseif(MZ_FETCH_LIBS)
clone_repo(zlib https://github.com/madler/zlib) clone_repo(zlib https://github.com/madler/zlib master)
# Don't automatically add all targets to the solution # Don't automatically add all targets to the solution
add_subdirectory(${ZLIB_SOURCE_DIR} ${ZLIB_BINARY_DIR} EXCLUDE_FROM_ALL) add_subdirectory(${ZLIB_SOURCE_DIR} ${ZLIB_BINARY_DIR} EXCLUDE_FROM_ALL)
@ -254,7 +254,7 @@ if(MZ_BZIP2)
set(PC_PRIVATE_LIBS "${PC_PRIVATE_LIBS} -lbz2") set(PC_PRIVATE_LIBS "${PC_PRIVATE_LIBS} -lbz2")
elseif(MZ_FETCH_LIBS) elseif(MZ_FETCH_LIBS)
clone_repo(bzip2 https://sourceware.org/git/bzip2.git) clone_repo(bzip2 https://sourceware.org/git/bzip2.git master)
# BZip2 repository does not support cmake so we have to create # BZip2 repository does not support cmake so we have to create
# the bzip2 library ourselves # the bzip2 library ourselves
@ -315,7 +315,7 @@ if(MZ_LZMA)
elseif(MZ_FETCH_LIBS) elseif(MZ_FETCH_LIBS)
set(BUILD_TESTING OFF CACHE BOOL "Build lzma tests" FORCE) set(BUILD_TESTING OFF CACHE BOOL "Build lzma tests" FORCE)
clone_repo(liblzma https://git.tukaani.org/xz.git) clone_repo(liblzma https://git.tukaani.org/xz.git master)
# Don't automatically add all targets to the solution # Don't automatically add all targets to the solution
add_subdirectory(${LIBLZMA_SOURCE_DIR} ${LIBLZMA_BINARY_DIR} EXCLUDE_FROM_ALL) add_subdirectory(${LIBLZMA_SOURCE_DIR} ${LIBLZMA_BINARY_DIR} EXCLUDE_FROM_ALL)
@ -367,7 +367,7 @@ if(MZ_ZSTD)
elseif(MZ_FETCH_LIBS) elseif(MZ_FETCH_LIBS)
set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "Build zstd programs") set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "Build zstd programs")
clone_repo(zstd https://github.com/facebook/zstd) clone_repo(zstd https://github.com/facebook/zstd release)
# Don't automatically add all targets to the solution # Don't automatically add all targets to the solution
add_subdirectory(${ZSTD_SOURCE_DIR}/build/cmake ${ZSTD_BINARY_DIR} EXCLUDE_FROM_ALL) add_subdirectory(${ZSTD_SOURCE_DIR}/build/cmake ${ZSTD_BINARY_DIR} EXCLUDE_FROM_ALL)

4
cmake/clone-repo.cmake
View File

@ -1,5 +1,5 @@
# Checkout remote repository # Checkout remote repository
macro(clone_repo name url) macro(clone_repo name url tag)
string(TOLOWER ${name} name_lower) string(TOLOWER ${name} name_lower)
string(TOUPPER ${name} name_upper) string(TOUPPER ${name} name_upper)
@ -7,7 +7,7 @@ macro(clone_repo name url)
set(${name_upper}_REPOSITORY ${url}) set(${name_upper}_REPOSITORY ${url})
endif() endif()
if(NOT ${name_upper}_TAG) if(NOT ${name_upper}_TAG)
set(${name_upper}_TAG master) set(${name_upper}_TAG ${tag})
endif() endif()
message(STATUS "Fetching ${name} ${${name_upper}_REPOSITORY} ${${name_upper}_TAG}") message(STATUS "Fetching ${name} ${${name_upper}_REPOSITORY} ${${name_upper}_TAG}")