[Cmake-commits] CMake branch, next, updated. v3.6.1-1105-g5d4a3ed

[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  5d4a3eda276b5dc2f98b61d5ed532e199e4c0ca8 (commit)
       via  e555480c60e95073840fe1a5f52004fd8ce81f9c (commit)
       via  2c0e87fff3347189db7454cf55669eec45819d9a (commit)
      from  13ce471eee787ca728646f4eec102f5ffc327efa (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d4a3eda276b5dc2f98b61d5ed532e199e4c0ca8
commit 5d4a3eda276b5dc2f98b61d5ed532e199e4c0ca8
Merge: 13ce471 e555480
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 4 09:52:42 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 4 09:52:42 2016 -0400

    Merge topic 'ninja-clang-rsp-format' into next
    
    e555480c Ninja: Fix response file format for GNU-like Clang on Windows
    2c0e87ff CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e555480c60e95073840fe1a5f52004fd8ce81f9c
commit e555480c60e95073840fe1a5f52004fd8ce81f9c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 4 09:41:10 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 4 09:44:56 2016 -0400

    Ninja: Fix response file format for GNU-like Clang on Windows
    
    The `CMAKE_<LANG>_SIMULATE_ID` variables are not set to "GNU" for a
    GNU-like Clang compiler on Windows.  They are only set to "MSVC" for a
    MSVC-like Clang.  Revise our response file format selection accordingly.
    
    Reported-by: Chaoren Lin <chaorenl at google.com>

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 51175c7..44418f2 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -554,11 +554,13 @@ void cmGlobalNinjaGenerator::EnableLanguage(
     this->ResolveLanguageCompiler(*l, mf, optional);
   }
 #ifdef _WIN32
-  if (mf->IsOn("CMAKE_COMPILER_IS_MINGW") ||
-      strcmp(mf->GetSafeDefinition("CMAKE_C_COMPILER_ID"), "GNU") == 0 ||
-      strcmp(mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID"), "GNU") == 0 ||
-      strcmp(mf->GetSafeDefinition("CMAKE_C_SIMULATE_ID"), "GNU") == 0 ||
-      strcmp(mf->GetSafeDefinition("CMAKE_CXX_SIMULATE_ID"), "GNU") == 0) {
+  if (strcmp(mf->GetSafeDefinition("CMAKE_C_SIMULATE_ID"), "MSVC") != 0 &&
+      strcmp(mf->GetSafeDefinition("CMAKE_CXX_SIMULATE_ID"), "MSVC") != 0 &&
+      (mf->IsOn("CMAKE_COMPILER_IS_MINGW") ||
+       strcmp(mf->GetSafeDefinition("CMAKE_C_COMPILER_ID"), "GNU") == 0 ||
+       strcmp(mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID"), "GNU") == 0 ||
+       strcmp(mf->GetSafeDefinition("CMAKE_C_COMPILER_ID"), "Clang") == 0 ||
+       strcmp(mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID"), "Clang") == 0)) {
     this->UsingGCCOnWindows = true;
   }
 #endif

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

Summary of changes:
 Source/CMakeVersion.cmake         |    2 +-
 Source/cmGlobalNinjaGenerator.cxx |   12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake