diff options
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/quadriflow/patches/blender.patch | 16 | ||||
| -rw-r--r-- | extern/quadriflow/src/config.hpp | 5 |
2 files changed, 21 insertions, 0 deletions
diff --git a/extern/quadriflow/patches/blender.patch b/extern/quadriflow/patches/blender.patch index d131abc52e2..55fdd123e3b 100644 --- a/extern/quadriflow/patches/blender.patch +++ b/extern/quadriflow/patches/blender.patch @@ -1,3 +1,19 @@ +diff --git a/extern/quadriflow/src/config.hpp b/extern/quadriflow/src/config.hpp +index 842b885..bf597ad 100644 +--- a/extern/quadriflow/src/config.hpp ++++ b/extern/quadriflow/src/config.hpp +@@ -1,6 +1,11 @@ + #ifndef CONFIG_H_ + #define CONFIG_H_ + ++/* Workaround a bug in boost 1.68, until we upgrade to a newer version. */ ++#if defined(__clang__) && defined(WIN32) ++ #include <boost/type_traits/is_assignable.hpp> ++ using namespace boost; ++#endif + // Move settings to cmake to make CMake happy :) + + // #define WITH_SCALE diff --git a/extern/quadriflow/3rd/lemon-1.3.1/lemon/arg_parser.cc b/extern/quadriflow/3rd/lemon-1.3.1/lemon/arg_parser.cc index 35a73d9..0eeba8a 100644 --- a/extern/quadriflow/3rd/lemon-1.3.1/lemon/arg_parser.cc diff --git a/extern/quadriflow/src/config.hpp b/extern/quadriflow/src/config.hpp index 842b885a209..bf597ad0f39 100644 --- a/extern/quadriflow/src/config.hpp +++ b/extern/quadriflow/src/config.hpp @@ -1,6 +1,11 @@ #ifndef CONFIG_H_ #define CONFIG_H_ +/* Workaround a bug in boost 1.68, until we upgrade to a newer version. */ +#if defined(__clang__) && defined(WIN32) + #include <boost/type_traits/is_assignable.hpp> + using namespace boost; +#endif // Move settings to cmake to make CMake happy :) // #define WITH_SCALE |