[Cmake-commits] CMake branch, next, updated. v3.3.1-2280-gc4643d5

[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  c4643d56966b19299bf05170a9a9241312ef390f (commit)
       via  3e94f94b898aa183badd2ac8be52d20b007d5b26 (commit)
      from  907ea3b6ed95b9ae3648868b77d744e82330fd9a (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=c4643d56966b19299bf05170a9a9241312ef390f
commit c4643d56966b19299bf05170a9a9241312ef390f
Merge: 907ea3b 3e94f94
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 20 09:40:42 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 20 09:40:42 2015 -0400

    Merge topic 'vs-fix-obj-extension' into next
    
    3e94f94b cmLocalVisualStudioGenerator: Use computed .obj extension (#13685)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e94f94b898aa183badd2ac8be52d20b007d5b26
commit 3e94f94b898aa183badd2ac8be52d20b007d5b26
Author:     Bastien Schatt <bastien.schatt at magestik.fr>
AuthorDate: Tue Aug 18 17:17:52 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 18 11:39:52 2015 -0400

    cmLocalVisualStudioGenerator: Use computed .obj extension (#13685)
    
    CMAKE_<LANG>_OUTPUT_EXTENSION tells us the proper extension for the
    current toolchain.  Teach the ComputeObjectFilenames method to use
    GetLanguageOutputExtension to look up the extension instead of
    hard-coding ".obj".  This is already done in the code path for explicit
    file names inside our call to GetObjectFileNameWithoutTarget.

diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index ca72939..3588853 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -57,7 +57,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames(
     cmSourceFile const* sf = si->first;
     std::string objectNameLower = cmSystemTools::LowerCase(
       cmSystemTools::GetFilenameWithoutLastExtension(sf->GetFullPath()));
-    objectNameLower += ".obj";
+    objectNameLower += this->GlobalGenerator->GetLanguageOutputExtension(*sf);
     counts[objectNameLower] += 1;
     }
 
@@ -70,7 +70,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames(
     cmSourceFile const* sf = si->first;
     std::string objectName =
       cmSystemTools::GetFilenameWithoutLastExtension(sf->GetFullPath());
-    objectName += ".obj";
+    objectName += this->GlobalGenerator->GetLanguageOutputExtension(*sf);
     if(counts[cmSystemTools::LowerCase(objectName)] > 1)
       {
       const_cast<cmGeneratorTarget*>(gt)->AddExplicitObjectName(sf);

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

Summary of changes:
 Source/cmLocalVisualStudioGenerator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake