Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-03-14 18:28:10 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-03-14 18:28:10 (GMT) |
| commit | 02d6188ab335e6c62b8341b84579d9549d215118 (patch) | |
| tree | 5b5232005f67128d60ce7953d66ad836364caf87 | |
| parent | 40140fa8bef0706d40f6b61f99c6bf97fcf1a9b2 (diff) | |
| download | swift-02d6188ab335e6c62b8341b84579d9549d215118.zip swift-02d6188ab335e6c62b8341b84579d9549d215118.tar.bz2 | |
Force the use of Boost Filesystem V2.
Resolves: #783
Release-Notes: Fixed compilation on systems with a recent version of Boost installed.
| -rw-r--r-- | 3rdParty/Boost/SConscript | 2 | ||||
| -rw-r--r-- | BuildTools/SCons/SConstruct | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript index 3c815b6..562b1b0 100644 --- a/3rdParty/Boost/SConscript +++ b/3rdParty/Boost/SConscript @@ -19,7 +19,7 @@ elif env.get("BOOST_BUNDLED", False) : # Common ################################################################################ - cppdefines = ["BOOST_ALL_NO_LIB", "BOOST_SYSTEM_NO_DEPRECATED"] + cppdefines = ["BOOST_ALL_NO_LIB", "BOOST_SYSTEM_NO_DEPRECATED", ("BOOST_FILESYSTEM_VERSION", "2")] #if env["PLATFORM"] == "darwin" : # cppdefines += ["BOOST_ASIO_DISABLE_KQUEUE"] if env["PLATFORM"] == "win32" : diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index cb248a5..f1f437a 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -352,6 +352,7 @@ conf.Finish() # Boost boost_conf_env = conf_env.Clone() boost_flags = {} +boost_flags["CPPDEFINES"] = [("BOOST_FILESYSTEM_VERSION", "2")] if env.get("boost_libdir", None) : boost_flags["LIBPATH"] = [env["boost_libdir"]] if env.get("boost_includedir", None) : |