From cfb0eda067d1bef74d419eac92317486424a7fbc Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Tue, 15 Nov 2022 22:19:24 +0100 Subject: [PATCH] Fix eigen installs --- nix/build-all.py | 2 +- win/build-deps.cmd | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/nix/build-all.py b/nix/build-all.py index d206e20e0b..94adbbdec2 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -485,7 +485,7 @@ if "json" in targets: urlretrieve(json_url, json_install_path) if "eigen" in targets: - git_clone_or_pull_repository("https://gitlab.com/libeigen/eigen.git", "{DEPS_DIR}/install/eigen-3.3.7".format(**locals()), revision="3.3.7") + git_clone_or_pull_repository("https://gitlab.com/libeigen/eigen.git", f"{DEPS_DIR}/install/eigen-3.3.9", revision="3.3.9") if "pcre" in targets: build_dependency( diff --git a/win/build-deps.cmd b/win/build-deps.cmd index 1aa9508a7f..4cca35dbf7 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -474,13 +474,9 @@ call :InstallCMakeProject "%DEPENDENCY_DIR%\%BUILD_DIR%" %BUILD_CFG% IF NOT %ERRORLEVEL%==0 GOTO :Error :Eigen -set DEPENDENCY_NAME=eigen -call :DownloadFile http://bitbucket.org/eigen/eigen/get/3.3.7.zip "%DEPS_DIR%" eigen-eigen-323c052e1731.zip -IF NOT %ERRORLEVEL%==0 GOTO :Error -call :ExtractArchive eigen-eigen-323c052e1731.zip "%DEPS_DIR%" "%DEPS_DIR%\eigen" -IF NOT %ERRORLEVEL%==0 GOTO :Error -IF NOT EXIST "%INSTALL_DIR%\Eigen\Eigen". mkdir "%INSTALL_DIR%\Eigen\Eigen" -robocopy /MIR "%DEPS_DIR%\eigen-eigen-323c052e1731\Eigen" "%INSTALL_DIR%\Eigen\Eigen" +set DEPENDENCY_NAME=Eigen +set DEPENDENCY_DIR=%INSTALL_DIR%\%DEPENDENCY_NAME% +call :GitCloneAndCheckoutRevision https://gitlab.com/libeigen/eigen.git "%DEPENDENCY_DIR%" 3.3.9 :Successful echo.