From 5aec551bf78ed79f6bec3160a5c7ce7fdac66776 Mon Sep 17 00:00:00 2001 From: Nathan Moinvaziri Date: Mon, 1 Apr 2024 09:44:11 -0700 Subject: [PATCH] Fixed zstd master branch no longer working. --- CMakeLists.txt | 8 ++++---- cmake/clone-repo.cmake | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ba11ae4..fcfd545 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,7 +197,7 @@ if(MZ_ZLIB) set(PC_PRIVATE_DEPS "zlib") set(ZLIB_COMPAT ON) 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 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") 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 # the bzip2 library ourselves @@ -315,7 +315,7 @@ if(MZ_LZMA) elseif(MZ_FETCH_LIBS) 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 add_subdirectory(${LIBLZMA_SOURCE_DIR} ${LIBLZMA_BINARY_DIR} EXCLUDE_FROM_ALL) @@ -367,7 +367,7 @@ if(MZ_ZSTD) elseif(MZ_FETCH_LIBS) 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 add_subdirectory(${ZSTD_SOURCE_DIR}/build/cmake ${ZSTD_BINARY_DIR} EXCLUDE_FROM_ALL) diff --git a/cmake/clone-repo.cmake b/cmake/clone-repo.cmake index 7ea515a..7326121 100644 --- a/cmake/clone-repo.cmake +++ b/cmake/clone-repo.cmake @@ -1,5 +1,5 @@ # Checkout remote repository -macro(clone_repo name url) +macro(clone_repo name url tag) string(TOLOWER ${name} name_lower) string(TOUPPER ${name} name_upper) @@ -7,7 +7,7 @@ macro(clone_repo name url) set(${name_upper}_REPOSITORY ${url}) endif() if(NOT ${name_upper}_TAG) - set(${name_upper}_TAG master) + set(${name_upper}_TAG ${tag}) endif() message(STATUS "Fetching ${name} ${${name_upper}_REPOSITORY} ${${name_upper}_TAG}")