Change blosc patching "checkout -f" to "reset --hard"
This commit is contained in:
parent
3b8ee78400
commit
54357f846f
2
deps/deps-unix-common.cmake
vendored
2
deps/deps-unix-common.cmake
vendored
@ -80,7 +80,7 @@ ExternalProject_Add(dep_blosc
|
|||||||
-DBUILD_TESTS=OFF
|
-DBUILD_TESTS=OFF
|
||||||
-DBUILD_BENCHMARKS=OFF
|
-DBUILD_BENCHMARKS=OFF
|
||||||
-DPREFER_EXTERNAL_ZLIB=ON
|
-DPREFER_EXTERNAL_ZLIB=ON
|
||||||
PATCH_COMMAND ${GIT_EXECUTABLE} checkout -f -- . && git clean -df &&
|
PATCH_COMMAND ${GIT_EXECUTABLE} reset --hard && git clean -df &&
|
||||||
${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/blosc-mods.patch
|
${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/blosc-mods.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user