diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2019-11-18 13:05:25 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2019-11-18 13:05:25 +0300 |
| commit | 3b8ee784008df955c8fc0ea4be7b1e935c0d7ce7 (patch) | |
| tree | f660b2591922e583b7147fcd8c22966762ec5dfd /deps | |
| parent | cfc927b3711701c68ad1e594e10db86e69f489ad (diff) | |
Use the upstream qhull with the macos patch instead of patching manually
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/deps-unix-common.cmake | 4 | ||||
| -rw-r--r-- | deps/deps-windows.cmake | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/deps/deps-unix-common.cmake b/deps/deps-unix-common.cmake index d0305bd4d..b2d82c950 100644 --- a/deps/deps-unix-common.cmake +++ b/deps/deps-unix-common.cmake @@ -58,13 +58,11 @@ ExternalProject_Add(dep_qhull #URL "https://github.com/qhull/qhull/archive/v7.3.2.tar.gz" #URL_HASH SHA256=619c8a954880d545194bc03359404ef36a1abd2dde03678089459757fd790cb0 GIT_REPOSITORY https://github.com/qhull/qhull.git - GIT_TAG v7.3.2 + GIT_TAG 7afedcc73666e46a9f1d74632412ebecf53b1b30 # v7.3.2 plus the mac build patch CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local ${DEP_CMAKE_OPTS} - PATCH_COMMAND ${GIT_EXECUTABLE} checkout -f -- . && git clean -df && - ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/qhull-mods.patch ) ExternalProject_Add(dep_blosc diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake index cca88c308..603f24931 100644 --- a/deps/deps-windows.cmake +++ b/deps/deps-windows.cmake @@ -221,7 +221,7 @@ ExternalProject_Add(dep_qhull #URL "https://github.com/qhull/qhull/archive/v7.3.2.tar.gz" #URL_HASH SHA256=619c8a954880d545194bc03359404ef36a1abd2dde03678089459757fd790cb0 GIT_REPOSITORY https://github.com/qhull/qhull.git - GIT_TAG v7.3.2 + GIT_TAG 7afedcc73666e46a9f1d74632412ebecf53b1b30 # v7.3.2 plus the mac build patch CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local |