SupportSetFunc: add missing define for windows std::sort

This flag needs to be present at the CMakeLists level, as Eigen is present everywhere in hpp-fcl.
lmontaut · May 10, 2024 · 343f892 · 343f892
1 parent 51f01a8
commit 343f892
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -225,6 +225,9 @@ IF(WIN32)
     Boost::thread
     Boost::date_time
   )
+  # There is an issue with MSVC 2017 and Eigen (due to std::aligned_storage).
+  # See https://github.com/ceres-solver/ceres-solver/issues/481
+  target_compile_definitions(${LIBRARY_NAME} PRIVATE _ENABLE_EXTENDED_ALIGNED_STORAGE)
 ENDIF(WIN32)
 
 if (HPP_FCL_TURN_ASSERT_INTO_EXCEPTION)

diff --git a/src/narrowphase/support_functions.cpp b/src/narrowphase/support_functions.cpp
@@ -38,6 +38,8 @@
 
 #include "hpp/fcl/narrowphase/support_functions.h"
 
+#include <algorithm>
+
 namespace hpp {
 namespace fcl {
 namespace details {