[Cmake-commits] CMake branch, next, updated. v2.8.11-2087-g5439f81

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5439f81c9cd296bb471e2f2777620e27d2bc6a92 (commit)
       via  7e0c45e9cf153d4fe0b7945fbe0ec759b456311f (commit)
      from  69f10a1146804230f8a3ceeedb5ef4bf4693c2d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5439f81c9cd296bb471e2f2777620e27d2bc6a92
commit 5439f81c9cd296bb471e2f2777620e27d2bc6a92
Merge: 69f10a1 7e0c45e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 20 15:28:48 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 20 15:28:48 2013 -0400

    Merge topic 'vs-asm-listing-location' into next
    
    7e0c45e VS: Allow /Fa to set AssemblerListingLocation (#14153)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e0c45e9cf153d4fe0b7945fbe0ec759b456311f
commit 7e0c45e9cf153d4fe0b7945fbe0ec759b456311f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 17 08:21:43 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 20 08:40:09 2013 -0400

    VS: Allow /Fa to set AssemblerListingLocation (#14153)
    
    Generate the default AssemblerListingLocation through the flag map so
    that it can be overridden by a user /Fa flag.  Also teach the VS 7-9
    generators to map /Fa to AssemblerListingLocation.
    
    While at it, fix the AssemblerListingLocation default value to have a
    trailing slash after the configuration name.  This ensures it will be
    treated as a directory and not a file name.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 59d5ef0..58d28da 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -476,6 +476,9 @@ cmVS7FlagTable cmLocalVisualStudio7GeneratorFlagTable[] =
   {"ForcedIncludeFiles", "FI", "Forced include files", "",
    cmVS7FlagTable::UserValueRequired | cmVS7FlagTable::SemicolonAppendable},
 
+  {"AssemblerListingLocation", "Fa", "ASM List Location", "",
+   cmVS7FlagTable::UserValue},
+
   // boolean flags
   {"BufferSecurityCheck", "GS", "Buffer security check", "TRUE", 0},
   {"BufferSecurityCheck", "GS-", "Turn off Buffer security check", "FALSE", 0},
@@ -740,6 +743,8 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
                         table,
                         this->ExtraFlagTable);
   targetOptions.FixExceptionHandlingDefault();
+  std::string asmLocation = std::string(configName) + "/";
+  targetOptions.AddFlag("AssemblerListingLocation", asmLocation.c_str());
   targetOptions.Parse(flags.c_str());
   targetOptions.Parse(defineFlags.c_str());
   targetOptions.ParseFinish();
@@ -836,7 +841,6 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   fout << "\"\n";
   targetOptions.OutputFlagMap(fout, "\t\t\t\t");
   targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n", "CXX");
-  fout << "\t\t\t\tAssemblerListingLocation=\"" << configName << "\"\n";
   fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n";
   fout << "/>\n";  // end of <Tool Name=VCCLCompilerTool
   tool = "VCCustomBuildTool";
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 5e8f76d..a76fc57 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1218,6 +1218,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(
@@ -1260,9 +1262,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);
 }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx   |    6 +++++-
 Source/cmVisualStudio10TargetGenerator.cxx |    5 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake