summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorVitaly Stakhovsky <vvs31415@gitlab.org>2018-01-29 17:59:53 (GMT)
committerBrad King <brad.king@kitware.com>2018-01-30 13:53:04 (GMT)
commit1fe66c462b3232a6f549b868d2f9ccd73c8bd1d0 (patch)
tree4fd48e7c6441bafe249b72cf0e219081ab4cd1c8 /Source
parent92cd3d06772ada13935790d66927ab4663c7d628 (diff)
downloadCMake-1fe66c462b3232a6f549b868d2f9ccd73c8bd1d0.zip
CMake-1fe66c462b3232a6f549b868d2f9ccd73c8bd1d0.tar.gz
CMake-1fe66c462b3232a6f549b868d2f9ccd73c8bd1d0.tar.bz2
VS: Restore the order of the AdditionalIncludeDirectories tag
Move the `AdditionalIncludeDirectories` tag back to the VS-preferred location in `.vcxproj` files. Fixes: #17691
Diffstat (limited to 'Source')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 4555358..51b9922 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2169,9 +2169,9 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
clOptions.AddIncludes(includeList);
clOptions.SetConfiguration(config.c_str());
clOptions.PrependInheritedString("AdditionalOptions");
- clOptions.OutputFlagMap(*this->BuildFileStream, " ");
clOptions.OutputAdditionalIncludeDirectories(*this->BuildFileStream,
" ", "\n", lang);
+ clOptions.OutputFlagMap(*this->BuildFileStream, " ");
clOptions.OutputPreprocessorDefinitions(*this->BuildFileStream, " ",
"\n", lang);
}
@@ -2535,9 +2535,9 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
}
this->WriteString("<ClCompile>\n", 2);
clOptions.PrependInheritedString("AdditionalOptions");
- clOptions.OutputFlagMap(*this->BuildFileStream, " ");
clOptions.OutputAdditionalIncludeDirectories(
*this->BuildFileStream, " ", "\n", this->LangForClCompile);
+ clOptions.OutputFlagMap(*this->BuildFileStream, " ");
clOptions.OutputPreprocessorDefinitions(*this->BuildFileStream, " ",
"\n", this->LangForClCompile);