From 6ad9386a8de47584fa53d425c54afa0732fa5913 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Tue, 8 Sep 2026 17:49:34 +0500 Subject: [PATCH] build: dont provide dependencies to cgal installation CGAL never runs `find_package` for `Boost`, `GMP` or `MPFR` during its configuration and never hardcodes their paths to the generated configs. So providing them have no effect. It's also can be confirmed by `build-deps.cmd` on Windows running all this time without the most of these args. Though it was settings `BOOST_ROOT` but it had no effect too. Probably it's some kind of artifact from CGAL past when it's used to be non-header-only library. --- nix/build-all.py | 8 +------- win/build-deps.cmd | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/nix/build-all.py b/nix/build-all.py index 30928c4201..8368d7501c 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -1567,13 +1567,7 @@ if "cgal" in targets: build_dependency( name=cgal_name, mode="cmake", - build_tool_args=[ - f"-DGMP_LIBRARIES={Dependencies.get_install_dir('gmp')}/lib/libgmp.{LIBRARY_EXT}", - f"-DGMP_INCLUDE_DIR={Dependencies.get_install_dir('gmp')}/include", - f"-DMPFR_LIBRARIES={Dependencies.get_install_dir('mpfr')}/lib/libmpfr.{LIBRARY_EXT}", - f"-DMPFR_INCLUDE_DIR={Dependencies.get_install_dir('mpfr')}/include", - f"-DBoost_INCLUDE_DIR={Dependencies.get_install_dir('boost')}", - ], + build_tool_args=[], download_url="https://github.com/CGAL/cgal.git", download_name="cgal", download_tool=download_tool_git, diff --git a/win/build-deps.cmd b/win/build-deps.cmd index 912edb27ae..28ac20e28d 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -387,8 +387,6 @@ echo BOOST_INSTALL_DIR=%DEPENDENCY_INSTALL_DIR%>>"%~dp0\%BUILD_DEPS_CACHE_PATH%" :: TODO: remove it a bit later. IF EXIST "%DEPS_DIR%\boost_%BOOST_VERSION:.=_%". rmdir /s /q "%DEPS_DIR%\boost_%BOOST_VERSION:.=_%" -:: Needed for CGAL build. -set BOOST_ROOT=%DEPENDENCY_DIR% :: NOTE Also zip download exists, if encountering problems with 7z for some reason. set ZIP_EXT=7z set BOOST_ZIP=boost-%BOOST_VERSION%-b2-nodocs.%ZIP_EXT%