Fix building QuadriFlow with Clang on Windows

Boost 1.68 has a bug in its type_traits where it does not include the right
header for the is_assignable macro when building with Clang. Temporarily work
around it until we upgrade to a newer Boost version that fixes it.

Differential Revision: https://developer.blender.org/D5962
This commit is contained in:
Ray molenkamp 2019-10-02 12:36:07 +02:00 committed by Brecht Van Lommel
parent f97a64aa9b
commit a434b30667
2 changed files with 21 additions and 0 deletions

View File

@ -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

View File

@ -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