1 files changed, 7 insertions, 1 deletions
diff --git a/Swift/SConscript b/Swift/SConscript
index daff755..b211435 100644
--- a/Swift/SConscript
+++ b/Swift/SConscript
@@ -13,5 +13,11 @@ if env["SCONS_STAGE"] == "build" :
         try :
             SConscript("QtUI/SConscript")
         except Exception as e:
-            print "Warning: %s" % str(e) 
+            print "Warning: %s" % str(e)
             env["PROJECTS"].remove("Swift")
+if "Swift" in env["PROJECTS"] and env["BOOST_1_64_DETECTED"] and not env.get("allow_boost_1_64") and not env.GetOption("clean") :
+    #Version 1.64 has some issues with the serialization of boost::optional, see https://svn.boost.org/trac10/ticket/13050
+    print "Boost 1.64 has been detected. It is not recommended to use this version due to a regression within the library. Swift has been removed from the current build. You can still use this version by setting allow_boost_1_64 to true, but recent chats and highlighting rules will reset."
+    env["PROJECTS"].remove("Swift")
+if env["help2man"]:
+    SConscript("Packaging/SConscript")
+\ No newline at end of file