From b216654282322c680935d5e5b841908a5fa58889 Mon Sep 17 00:00:00 2001
From: giy <giy@omp-system.ru>
Date: Wed, 22 Jun 2022 09:09:42 +0300
Subject: [PATCH] Правка подключения include для moc скрипта
---
QtVsTools.Core/QtProject.cs | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/QtVsTools.Core/QtProject.cs b/QtVsTools.Core/QtProject.cs
index 4f4183a..613b4e5 100644
--- a/QtVsTools.Core/QtProject.cs
+++ b/QtVsTools.Core/QtProject.cs
@@ -852,6 +852,22 @@
includeList.AddRange(GetIncludesFromPropertySheet(sheet));
}
+ var ompModified = new List<string>();
+ string sDir = "$(SolutionDir)";
+ foreach (string inc in includeList) {
+ if (inc.EndsWith(")")) {
+ ompModified.Add(inc + "\\.");
+ } else if (inc.Contains(sDir) && inc.ElementAt(inc.IndexOf(sDir) + sDir.Length) != '\\') {
+ string ompString = inc;
+ ompString = ompString.Insert(inc.IndexOf(sDir) + sDir.Length, "\\");
+ ompModified.Add(ompString);
+ } else {
+ ompModified.Add(inc);
+ }
+ }
+
+ includeList = ompModified;
+
var includes = string.Empty;
var alreadyAdded = new List<string>();
foreach (var include in includeList) {
--
Gitblit v1.9.1