diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-18 15:41:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-07-18 15:41:49 (GMT) |
| commit | d96bc3cf048756695a651a8561b763cfc5cead86 (patch) | |
| tree | 506c6d7bab8eb8aee48fb347eb56b7b9641a2bc1 /Source | |
| parent | 1a2d260634807682a94aee140e77d52168f10ba6 (diff) | |
| parent | c1fc6c80c777172139e67753530f610d642a4656 (diff) | |
| download | CMake-d96bc3cf048756695a651a8561b763cfc5cead86.zip CMake-d96bc3cf048756695a651a8561b763cfc5cead86.tar.gz CMake-d96bc3cf048756695a651a8561b763cfc5cead86.tar.bz2 | |
Merge branch 'vs-asmlist-dir' into release-3.15
Merge-request: !3569
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 7ba3471..8154f3e 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -703,8 +703,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration( } Options targetOptions(this, t, table, gg->ExtraFlagTable); targetOptions.FixExceptionHandlingDefault(); - std::string asmLocation = configName + "/"; - targetOptions.AddFlag("AssemblerListingLocation", asmLocation); + targetOptions.AddFlag("AssemblerListingLocation", "$(IntDir)\\"); targetOptions.Parse(flags); targetOptions.Parse(defineFlags); targetOptions.ParseFinish(); diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index ee5f9b4..8c6ba4e 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2643,8 +2643,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions( clOptions.AddFlag("UseFullPaths", "false"); } clOptions.AddFlag("PrecompiledHeader", "NotUsing"); - std::string asmLocation = configName + "/"; - clOptions.AddFlag("AssemblerListingLocation", asmLocation); + clOptions.AddFlag("AssemblerListingLocation", "$(IntDir)"); } } |