From a55187600e8640475e1d22e14ce3be5538089023 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Sun, 24 Jan 2021 12:14:43 +0100 Subject: [PATCH] Update to CGAL 5.2 --- win/build-deps.cmd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/win/build-deps.cmd b/win/build-deps.cmd index ca1281311e..29c5bce928 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -442,12 +442,14 @@ IF NOT %ERRORLEVEL%==0 GOTO :Error :cgal set DEPENDENCY_NAME=cgal set DEPENDENCY_DIR=%DEPS_DIR%\cgal -call :GitCloneAndCheckoutRevision https://github.com/CGAL/cgal.git "%DEPENDENCY_DIR%" releases/CGAL-4.13.3 +REM call :GitCloneAndCheckoutRevision https://github.com/CGAL/cgal.git "%DEPENDENCY_DIR%" releases/CGAL-4.13.3 +call :GitCloneAndCheckoutRevision https://github.com/CGAL/cgal.git "%DEPENDENCY_DIR%" v5.2 IF NOT %ERRORLEVEL%==0 GOTO :Error cd "%DEPENDENCY_DIR%" git reset --hard git apply "%~dp0patches\cgal_no_zlib.patch" -git apply "%~dp0patches\cgal_4768.patch" +REM merged upstrem +REM git apply "%~dp0patches\cgal_4768.patch" call :RunCMake -DCMAKE_INSTALL_PREFIX="%INSTALL_DIR%\cgal" ^ -DBOOST_ROOT="%DEPS_DIR%\boost_%BOOST_VER%" ^ -DGMP_INCLUDE_DIR="%INSTALL_DIR%\mpir" ^