mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-14 17:53:37 +00:00
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
diff --git a/SuperBuild/External-CLOUDFLARE-ZLIB.cmake b/SuperBuild/External-CLOUDFLARE-ZLIB.cmake
|
||
|
|
index 9f064eb..fe74df5 100644
|
||
|
|
--- a/SuperBuild/External-CLOUDFLARE-ZLIB.cmake
|
||
|
|
+++ b/SuperBuild/External-CLOUDFLARE-ZLIB.cmake
|
||
|
|
@@ -1,8 +1,5 @@
|
||
|
|
-set(CLOUDFLARE_BRANCH gcc.amd64) # Cloudflare zlib branch
|
||
|
|
-
|
||
|
|
ExternalProject_Add(zlib
|
||
|
|
- GIT_REPOSITORY "${git_protocol}://github.com/ningfei/zlib.git"
|
||
|
|
- GIT_TAG "${CLOUDFLARE_BRANCH}"
|
||
|
|
+ URL file://@cloudflareZlib@
|
||
|
|
SOURCE_DIR cloudflare-zlib
|
||
|
|
BINARY_DIR cloudflare-zlib-build
|
||
|
|
CMAKE_ARGS
|
||
|
|
diff --git a/SuperBuild/SuperBuild.cmake b/SuperBuild/SuperBuild.cmake
|
||
|
|
index 2a0a956..81354a7 100644
|
||
|
|
--- a/SuperBuild/SuperBuild.cmake
|
||
|
|
+++ b/SuperBuild/SuperBuild.cmake
|
||
|
|
@@ -1,17 +1,3 @@
|
||
|
|
-# Check if git exists
|
||
|
|
-find_package(Git)
|
||
|
|
-if(NOT GIT_FOUND)
|
||
|
|
- message(FATAL_ERROR "Cannot find Git. Git is required for Superbuild")
|
||
|
|
-endif()
|
||
|
|
-
|
||
|
|
-# Use git protocol or not
|
||
|
|
-option(USE_GIT_PROTOCOL "If behind a firewall turn this off to use http instead." ON)
|
||
|
|
-if(USE_GIT_PROTOCOL)
|
||
|
|
- set(git_protocol "git")
|
||
|
|
-else()
|
||
|
|
- set(git_protocol "https")
|
||
|
|
-endif()
|
||
|
|
-
|
||
|
|
# Basic CMake build settings
|
||
|
|
if(NOT CMAKE_BUILD_TYPE)
|
||
|
|
set(CMAKE_BUILD_TYPE "Release" CACHE STRING
|