From 8c6d72cbcb5af4e08b353ce701d9a88dff4efe92 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Mon, 1 Jul 2024 13:51:21 -0700 Subject: [PATCH 1/2] Remove redundant #include (#222) --- src/trajoptlibrust.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/trajoptlibrust.cpp b/src/trajoptlibrust.cpp index dc3fdb8f..6b05d1e7 100644 --- a/src/trajoptlibrust.cpp +++ b/src/trajoptlibrust.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include From bfc4e8fa893f61ee8dc0f4603be9886651653c19 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Mon, 1 Jul 2024 14:06:37 -0700 Subject: [PATCH 2/2] Upgrade Sleipnir to fmtlib 11.0.0 (#223) --- build.rs | 4 ++++ cmake/0001-Downgrade-to-C-20.patch | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.rs b/build.rs index bd8ed72f..73b66a2e 100644 --- a/build.rs +++ b/build.rs @@ -26,6 +26,10 @@ fn main() { .include(format!("{}/include/eigen3", 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 index 08a9c986..2c311a38 100644 --- 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 #include -+#include ++#include + namespace sleipnir {