diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2019-11-18 14:09:46 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2019-11-18 14:09:46 +0300 |
| commit | 54357f846f695d9879fb023e8cb8de7804ca0dca (patch) | |
| tree | 6ff68d04e4337cb800147fad18bd774cca579ac3 /deps | |
| parent | 3b8ee784008df955c8fc0ea4be7b1e935c0d7ce7 (diff) | |
Change blosc patching "checkout -f" to "reset --hard"
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/deps-unix-common.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/deps-unix-common.cmake b/deps/deps-unix-common.cmake index b2d82c950..7491aafe1 100644 --- a/deps/deps-unix-common.cmake +++ b/deps/deps-unix-common.cmake @@ -80,7 +80,7 @@ ExternalProject_Add(dep_blosc -DBUILD_TESTS=OFF -DBUILD_BENCHMARKS=OFF -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 ) |