win: key the CGAL install dir on its version

6dbc4e28d raised the minimum CGAL to 5.4. The Windows dependency cache in
build-outputs is keyed on the install directory name and only ever adds to
it, so the unversioned `cgal` directory kept serving CGAL 5.2.3 and the
Windows build has failed at configure since:

  Could not find a configuration file for package "CGAL" that is compatible
  ... cgal/lib/cmake/CGAL/CGALConfig.cmake, version: 5.2.3

Name the directory `cgal-5.5.5`, as the TODO already suggested, and record
it in the deps cache like the other installers do.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Dion Moult
2026-09-17 16:27:27 +10:00
parent e389fb6145
commit 3c81e6e2e7
3 changed files with 9 additions and 4 deletions
+1 -1
View File
@@ -68,7 +68,7 @@ class Deps:
# We don't install Eigen currently,
# so there's no Eigen3config.cmake and therefore we provide path explicitly.
"eigen": Dep("EIGEN_DIR", Path("Eigen"), cmake_prefix=False, pass_as_cmake_arg=True),
"cgal": Dep("CGAL_INSTALL_DIR", Path("cgal")),
"cgal": Dep("CGAL_INSTALL_DIR", None),
"gmp": Dep("GMP_INSTALL_DIR", Path("mpir")),
"mpfr": Dep("MPFR_INSTALL_DIR", Path("mpfr")),
# CCACHE_INSTALL_DIR is only set when ccache wasn't found on PATH.