summaryrefslogtreecommitdiff
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-07-19 15:55:37 +0000
committerKitware Robot <kwrobot@kitware.com>2019-07-19 11:55:48 -0400
commit6618cbf38aa8298a5881669d8b095a4110f102f6 (patch)
treea6214a4ac08138fa7fa16bb7fcc965145ea5efc9 /Source/cmVisualStudio10TargetGenerator.cxx
parent1bdb5a3b5113a075393a0760888604684c43c64b (diff)
parentc1fc6c80c777172139e67753530f610d642a4656 (diff)
downloadcmake-6618cbf38aa8298a5881669d8b095a4110f102f6.tar.gz
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
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index ae347fe508..4a151b3639 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)");
}
}