From 729af993fe9b4dce1c683420cdfcb977a2c4add6 Mon Sep 17 00:00:00 2001 From: Nekto89 Date: Tue, 8 Aug 2017 00:51:12 +0300 Subject: [PATCH] Fix absolute pathes import from vcxproj (#934) Fixed importing vcxproj that contains files with absolute pathes. --- lib/importproject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/importproject.cpp b/lib/importproject.cpp index c1ce7002d..9e784e19f 100644 --- a/lib/importproject.cpp +++ b/lib/importproject.cpp @@ -493,7 +493,7 @@ void ImportProject::importVcxproj(const std::string &filename, std::map::const_iterator c = compileList.begin(); c != compileList.end(); ++c) { for (std::list::const_iterator p = projectConfigurationList.begin(); p != projectConfigurationList.end(); ++p) { FileSettings fs; - fs.filename = Path::simplifyPath(Path::getPathFromFilename(filename) + *c); + fs.filename = Path::simplifyPath(Path::isAbsolute(*c) ? *c : Path::getPathFromFilename(filename) + *c); fs.cfg = p->name; fs.defines = "_MSC_VER=1900;_WIN32=1"; if (p->platform == ProjectConfiguration::Win32)