forked from teamnwah/openmw-tes3coop
fix: boost::filesystem::canonical() available from version 1.48.
This commit is contained in:
parent
931c95d0b1
commit
72e94380be
1 changed files with 5 additions and 4 deletions
|
@ -8,6 +8,7 @@
|
|||
#include <sstream>
|
||||
#include <components/misc/stringops.hpp>
|
||||
|
||||
#include <boost/version.hpp>
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/filesystem/fstream.hpp>
|
||||
|
||||
|
@ -885,10 +886,10 @@ std::time_t MwIniImporter::lastWriteTime(const boost::filesystem::path& filename
|
|||
std::time_t writeTime(defaultTime);
|
||||
if (boost::filesystem::exists(filename))
|
||||
{
|
||||
// FixMe: remove #if when Boost on Travis Linux updated
|
||||
// Travis seems to be using older version of boost for Linux
|
||||
// This should allow things to build until fixed
|
||||
#if BOOST_FILESYSTEM_VERSION == 3
|
||||
// FixMe: remove #if when Boost dependency for Linux builds updated
|
||||
// This allows Linux to build until then
|
||||
#if (BOOST_VERSION >= 104800)
|
||||
// need to resolve any symlinks so that we get time of file, not symlink
|
||||
boost::filesystem::path resolved = boost::filesystem::canonical(filename);
|
||||
#else
|
||||
boost::filesystem::path resolved = filename;
|
||||
|
|
Loading…
Reference in a new issue