From 0c374c263926a64953c7e3412f515273c3a74433 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Wed, 3 Apr 2024 09:08:28 -0700 Subject: [PATCH] Upgrade TrajoptLib to require lower minimum CMake version (#431) --- docs/contributing/building-choreo.md | 6 +++--- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/contributing/building-choreo.md b/docs/contributing/building-choreo.md index f50ff7d65b..61206b268c 100644 --- a/docs/contributing/building-choreo.md +++ b/docs/contributing/building-choreo.md @@ -2,17 +2,17 @@ ### Requirements for Windows -- [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm), [Rust](https://www.rust-lang.org/tools/install) ≥ 1.70.0, [CMake](https://cmake.org/download) ≥ 3.24, [Git](https://git-scm.com/) +- [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm), [Rust](https://www.rust-lang.org/tools/install) ≥ 1.70.0, [CMake](https://cmake.org/download) ≥ 3.21, [Git](https://git-scm.com/) - [Visual Studio Community 2022](https://visualstudio.microsoft.com/vs/community/) with C++ programming language selected during installation ### Requirements for macOS -- [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm), [Rust](https://www.rust-lang.org/tools/install) ≥ 1.70.0, [CMake](https://cmake.org/download) ≥ 3.24, [Git](https://git-scm.com/) +- [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm), [Rust](https://www.rust-lang.org/tools/install) ≥ 1.70.0, [CMake](https://cmake.org/download) ≥ 3.21, [Git](https://git-scm.com/) - Xcode ≥ 15.0.1 command-line tools via `xcode-select --install` ### Requirements for Linux -- [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm), [Rust](https://www.rust-lang.org/tools/install) ≥ 1.70.0, [CMake](https://cmake.org/download) ≥ 3.24, [Git](https://git-scm.com/) +- [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm), [Rust](https://www.rust-lang.org/tools/install) ≥ 1.70.0, [CMake](https://cmake.org/download) ≥ 3.21, [Git](https://git-scm.com/) - GCC ≥ 11 via `sudo apt install gcc` - Tauri dependencies (see [here](https://tauri.app/v1/guides/getting-started/prerequisites/#setting-up-linux)). diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 24a0d37a47..295ac94bbc 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -3175,7 +3175,7 @@ dependencies = [ [[package]] name = "trajoptlib" version = "0.1.0" -source = "git+https://github.com/SleipnirGroup/TrajoptLib.git?rev=325ddaa659cd36db8a87da363b66f66837df3e8f#325ddaa659cd36db8a87da363b66f66837df3e8f" +source = "git+https://github.com/SleipnirGroup/TrajoptLib.git?rev=4b238aa71a1d92a8e4e9913dfc25a6ee81d57cb8#4b238aa71a1d92a8e4e9913dfc25a6ee81d57cb8" dependencies = [ "cmake", "cxx", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 80967da2ec..204c1e4b92 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -18,7 +18,7 @@ tauri-build = { version = "1.5.1", features = [] } tauri = { version = "1.6.0", features = [ "window-close", "window-set-title", "path-all", "dialog", "dialog-confirm", "dialog-save", "dialog-open", "dialog-ask", "fs-all", "shell-open", "devtools"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -trajoptlib = { git = "https://github.com/SleipnirGroup/TrajoptLib.git", rev = "325ddaa659cd36db8a87da363b66f66837df3e8f", features = ["sleipnir"] } +trajoptlib = { git = "https://github.com/SleipnirGroup/TrajoptLib.git", rev = "4b238aa71a1d92a8e4e9913dfc25a6ee81d57cb8", features = ["sleipnir"] } open = "3" [features]