[Cmake-commits] CMake branch, next, updated. v3.2.2-2646-g9d6b955

[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  9d6b955390f91f4c095689d085c24d865993f25d (commit)
       via  ca658a456f80febe05e57bfae8448c8646960ddf (commit)
      from  27ffcfc50e8c3319cec3c752cce976b2c75ceae5 (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=9d6b955390f91f4c095689d085c24d865993f25d
commit 9d6b955390f91f4c095689d085c24d865993f25d
Merge: 27ffcfc ca658a4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 8 11:21:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 8 11:21:45 2015 -0400

    Merge topic 'ninja-gcc-windows' into next
    
    ca658a45 Ninja: Use forward slashes for linking with any GCC on Windows (#15439)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca658a456f80febe05e57bfae8448c8646960ddf
commit ca658a456f80febe05e57bfae8448c8646960ddf
Author:     Thomas Herz <thomas.herz at kuka.com>
AuthorDate: Fri May 8 15:38:04 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 8 11:20:10 2015 -0400

    Ninja: Use forward slashes for linking with any GCC on Windows (#15439)
    
    Fix a condition forgotten by commit b3de0dfe (Ninja: Use forward slashes
    for any GCC on Windows, 2015-05-07).

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 4c51d23..771ecc4 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -565,7 +565,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     vars["TARGET_PDB"] = base + suffix + dbg_suffix;
     }
 
-  if (mf->IsOn("CMAKE_COMPILER_IS_MINGW"))
+  if (this->GetGlobalGenerator()->IsGCCOnWindows())
     {
     const std::string objPath = GetTarget()->GetSupportDirectory();
     vars["OBJECT_DIR"] = ConvertToNinjaPath(objPath);

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

Summary of changes:
 Source/cmNinjaNormalTargetGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake