Commit c1fc6c80 authored by Brad King's avatar Brad King

VS: Place intermediate files in the "ASM List Location" next to objects

The `AssemblerListingLocation` setting in VS project files is meant for
intermediate files created during the build much like object files.
When the VS 7 generator was first under development, commit 49aebe6c
(new arch, 2002-09-04) placed both object files and the ASM list
location in the same directory.  Later commit f9aef0e4 (Generator now
creates a separate intermediate files directory for each target,
2005-07-27) moved the object files to a per-target directory but the
ASM list location was not moved with them.  Move it now.

Fixes: #19480
parent 79bcf4e1
...@@ -703,8 +703,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration( ...@@ -703,8 +703,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(
} }
Options targetOptions(this, t, table, gg->ExtraFlagTable); Options targetOptions(this, t, table, gg->ExtraFlagTable);
targetOptions.FixExceptionHandlingDefault(); targetOptions.FixExceptionHandlingDefault();
std::string asmLocation = configName + "/"; targetOptions.AddFlag("AssemblerListingLocation", "$(IntDir)\\");
targetOptions.AddFlag("AssemblerListingLocation", asmLocation);
targetOptions.Parse(flags); targetOptions.Parse(flags);
targetOptions.Parse(defineFlags); targetOptions.Parse(defineFlags);
targetOptions.ParseFinish(); targetOptions.ParseFinish();
...@@ -2643,8 +2643,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions( ...@@ -2643,8 +2643,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
clOptions.AddFlag("UseFullPaths", "false"); clOptions.AddFlag("UseFullPaths", "false");
} }
clOptions.AddFlag("PrecompiledHeader", "NotUsing"); clOptions.AddFlag("PrecompiledHeader", "NotUsing");
std::string asmLocation = configName + "/"; clOptions.AddFlag("AssemblerListingLocation", "$(IntDir)");
clOptions.AddFlag("AssemblerListingLocation", asmLocation);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment