Merge branch 'main' into better-initial-guess-wpi-v2

SleipnirGroup · Jul 2, 2024 · 7b9e6e9 · 7b9e6e9
2 parents cb5efb6 + bfc4e8f
commit 7b9e6e9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/build.rs b/build.rs
@@ -28,6 +28,10 @@ fn main() {
         .include(format!("{}/include/wpiutil", cmake_dest.display()))
         .std("c++20");
 
+    if cfg!(target_os = "windows") {
+        bridge_build.flag("/EHsc").flag("/utf-8");
+    }
+
     bridge_build.compile("trajoptrust");
 
     println!(

diff --git a/cmake/0001-Downgrade-to-C-20.patch b/cmake/0001-Downgrade-to-C-20.patch
@@ -35,7 +35,7 @@ index e9668b53d6a0317cf2367b212f5013cbb2aa7ad5..1db191b6492a5f10b657c42c7959a73e
 +fetchcontent_declare(
 +    fmt
 +    GIT_REPOSITORY https://github.com/fmtlib/fmt.git
-+    GIT_TAG 10.2.1
++    GIT_TAG 11.0.0
 +)
 +fetchcontent_makeavailable(fmt)
 +
@@ -79,7 +79,7 @@ index 339320bce6d017ca85025060ba445b2f025bb225..fcf2e69bfb5a081cd915bdded3caa80c
  #include <system_error>
  #include <utility>
 
-+#include <fmt/core.h>
++#include <fmt/base.h>
 +
  namespace sleipnir {
 

diff --git a/src/trajoptlibrust.cpp b/src/trajoptlibrust.cpp
@@ -5,7 +5,6 @@
 #include <stdint.h>
 
 #include <cstddef>
-#include <memory>
 #include <stdexcept>
 #include <vector>