Browse Source

Merge pull request #1277 from l-n-s/update_zlib_version

CMake: bump version of ZLib
pull/1278/head
R4SAS 6 years ago committed by GitHub
parent
commit
d84c9ad611
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      build/CMakeLists.txt

4
build/CMakeLists.txt

@ -364,8 +364,8 @@ if (NOT ZLIB_FOUND )
set( ZLIB_EXTRA -DASM686=ON "-DCMAKE_ASM_MASM_FLAGS=/W0 /safeseh" ) set( ZLIB_EXTRA -DASM686=ON "-DCMAKE_ASM_MASM_FLAGS=/W0 /safeseh" )
endif() endif()
ExternalProject_Add(zlib-project ExternalProject_Add(zlib-project
URL http://zlib.net/zlib-1.2.8.tar.gz URL https://zlib.net/zlib-1.2.11.tar.gz
URL_MD5 44d667c142d7cda120332623eab69f40 URL_HASH SHA256=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/zlib PREFIX ${CMAKE_CURRENT_BINARY_DIR}/zlib
PATCH_COMMAND "${PATCH}" -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/cmake-zlib-static.patch PATCH_COMMAND "${PATCH}" -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/cmake-zlib-static.patch
&& "${PATCH}" -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/cmake-zlib-amd64.patch && "${PATCH}" -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/cmake-zlib-amd64.patch

Loading…
Cancel
Save