diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-21 19:14:19 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-05-21 19:14:19 (GMT) |
| commit | bdb0bab8ee5093dcace10b4da9064225e31bfea0 (patch) | |
| tree | d4762330857e55378a396c16d9b946d0e12dab9c /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 1dbf0aac1bdb6cf47f4efc6c155078f9c6a7a602 (diff) | |
| parent | 7e0c45e9cf153d4fe0b7945fbe0ec759b456311f (diff) | |
| download | CMake-bdb0bab8ee5093dcace10b4da9064225e31bfea0.zip CMake-bdb0bab8ee5093dcace10b4da9064225e31bfea0.tar.gz CMake-bdb0bab8ee5093dcace10b4da9064225e31bfea0.tar.bz2 | |
Merge topic 'vs-asm-listing-location'
7e0c45e VS: Allow /Fa to set AssemblerListingLocation (#14153)
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 273b203..88c4deb 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1271,6 +1271,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions( std::string defineFlags = this->Target->GetMakefile()->GetDefineFlags(); clOptions.FixExceptionHandlingDefault(); clOptions.AddFlag("PrecompiledHeader", "NotUsing"); + std::string asmLocation = configName + "/"; + clOptions.AddFlag("AssemblerListingLocation", asmLocation.c_str()); clOptions.Parse(flags.c_str()); clOptions.Parse(defineFlags.c_str()); clOptions.AddDefines(this->Target->GetCompileDefinitions( @@ -1313,9 +1315,6 @@ void cmVisualStudio10TargetGenerator::WriteClOptions( clOptions.OutputPreprocessorDefinitions(*this->BuildFileStream, " ", "\n", "CXX"); - this->WriteString("<AssemblerListingLocation>", 3); - *this->BuildFileStream << configName - << "</AssemblerListingLocation>\n"; this->WriteString("<ObjectFileName>$(IntDir)</ObjectFileName>\n", 3); this->WriteString("</ClCompile>\n", 2); } |