diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-31 13:32:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-31 13:33:00 (GMT) |
| commit | 0a37b515affb386472758e43d53efa983dbe0701 (patch) | |
| tree | efe78933e2f895dab73f7e52828ecfb0ead94286 /Source | |
| parent | efa5a26d021cf5476bebff54dd28f115c962ae9b (diff) | |
| parent | 1fe66c462b3232a6f549b868d2f9ccd73c8bd1d0 (diff) | |
| download | CMake-0a37b515affb386472758e43d53efa983dbe0701.zip CMake-0a37b515affb386472758e43d53efa983dbe0701.tar.gz CMake-0a37b515affb386472758e43d53efa983dbe0701.tar.bz2 | |
Merge topic 'vs-restore-order'
1fe66c46 VS: Restore the order of the AdditionalIncludeDirectories tag
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1719
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index e15e833..2615e4c 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); |