[Cmake-commits] CMake branch, next, updated. v2.8.2-928-g6ba893a

[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  6ba893ac7f5d55287878a62512e79625d5972509 (commit)
       via  7ef659fcc3db3d11190526101f123992728794e0 (commit)
      from  9745f89488e1cd20993b5b2aa6611dec1978dbf5 (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=6ba893ac7f5d55287878a62512e79625d5972509
commit 6ba893ac7f5d55287878a62512e79625d5972509
Merge: 9745f89 7ef659f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 27 09:05:30 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 27 09:05:30 2010 -0400

    Merge topic 'vs10-object-intdir' into next
    
    7ef659f VS10: Use $(IntDir) for per-source output directory (#11270)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ef659fcc3db3d11190526101f123992728794e0
commit 7ef659fcc3db3d11190526101f123992728794e0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 27 08:37:00 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 27 08:37:00 2010 -0400

    VS10: Use $(IntDir) for per-source output directory (#11270)
    
    The original implementation of this generator accidentally used
    "$(Configuration)/" for source-specific object file names.  Correct it
    to use "$(IntDir)/" just like the generators for all previous VS
    versions.  The target-wide output directory is "$(IntDir)/" already.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index b290aed..8dfafff 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -767,7 +767,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
     hasFlags = true;
     this->WriteString("<ObjectFileName>", 3);
     (*this->BuildFileStream )
-      << "$(Configuration)/" << objectName << "</ObjectFileName>\n";
+      << "$(IntDir)/" << objectName << "</ObjectFileName>\n";
     }
   std::vector<std::string> *configs =
     static_cast<cmGlobalVisualStudio7Generator *>

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake