summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'BuildTools/SCons/SConstruct')
-rw-r--r--BuildTools/SCons/SConstruct7
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
@@ -244,2 +244,8 @@ 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()
@@ -782,2 +788 @@ if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) and not env.get("HAV
Exit(1)
-