diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-19 15:55:37 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-19 15:55:48 (GMT) |
| commit | 6618cbf38aa8298a5881669d8b095a4110f102f6 (patch) | |
| tree | a6214a4ac08138fa7fa16bb7fcc965145ea5efc9 | |
| parent | 1bdb5a3b5113a075393a0760888604684c43c64b (diff) | |
| parent | c1fc6c80c777172139e67753530f610d642a4656 (diff) | |
| download | CMake-6618cbf38aa8298a5881669d8b095a4110f102f6.zip CMake-6618cbf38aa8298a5881669d8b095a4110f102f6.tar.gz CMake-6618cbf38aa8298a5881669d8b095a4110f102f6.tar.bz2 | |
Merge topic 'vs-asmlist-dir'
c1fc6c80c7 VS: Place intermediate files in the "ASM List Location" next to objects
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3569
| -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 ae347fe..4a151b3 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2649,8 +2649,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions( clOptions.AddFlag("UseFullPaths", "false"); } clOptions.AddFlag("PrecompiledHeader", "NotUsing"); - std::string asmLocation = configName + "/"; - clOptions.AddFlag("AssemblerListingLocation", asmLocation); + clOptions.AddFlag("AssemblerListingLocation", "$(IntDir)"); } } |