1 files changed, 6 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 2c2d629..6d63d5b 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -242,6 +242,12 @@ elif not env.get("boost_bundled_enable", True) :
     Exit(1)
 else :
     env["BOOST_BUNDLED"] = True
+boost_version = GetVersion(conf, "BOOST_VERSION", "boost/version.hpp")
+if boost_version == 106400 :
+    #Version 1.64 has some issues with the serialization of boost::optional, see https://svn.boost.org/trac10/ticket/13050
+    env["BOOST_1_64_DETECTED"] = True
+else:
+    env["BOOST_1_64_DETECTED"] = False
 conf.Finish()
 
 
@@ -780,4 +786,3 @@ print
 if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) and not env.get("HAVE_SCHANNEL", 0) and not env.get("HAVE_SECURETRANSPORT", 0):
     print "Error: A working TLS backend is required. Please check the documentation for more information."
     Exit(1)
-