[Cmake-commits] CMake branch, next, updated. v2.8.12-4548-gced8281

[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  ced8281000bf7c101ec23860c232703d284a6eaf (commit)
       via  bdd26bf3ce381098876d68bc2787a5d366fb1fb9 (commit)
      from  e7bd8e08cd1a675e41d6c3a491a2c585b955f6c4 (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=ced8281000bf7c101ec23860c232703d284a6eaf
commit ced8281000bf7c101ec23860c232703d284a6eaf
Merge: e7bd8e0 bdd26bf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Oct 27 10:19:39 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Oct 27 10:19:39 2013 -0400

    Merge topic 'enable-language-require-compiler' into next
    
    bdd26bf CMakeDetermineCompilerId: Always use compiler detected from IDE


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bdd26bf3ce381098876d68bc2787a5d366fb1fb9
commit bdd26bf3ce381098876d68bc2787a5d366fb1fb9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Oct 27 10:06:42 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Oct 27 10:06:54 2013 -0400

    CMakeDetermineCompilerId: Always use compiler detected from IDE
    
    When compiler id detection also provides a CMAKE_<LANG>_COMPILER
    value, use it unconditionally.  It is known to be the compiler
    that is actually in use by IDE builds in VS and Xcode.  Do not
    let a stray cache entry try to say otherwise.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 6fccb16..762d4ae 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -67,12 +67,10 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
   endif()
 
   # Check if compiler id detection gave us the compiler tool.
-  if(NOT CMAKE_${lang}_COMPILER)
-    if(CMAKE_${lang}_COMPILER_ID_TOOL)
-      set(CMAKE_${lang}_COMPILER "${CMAKE_${lang}_COMPILER_ID_TOOL}" PARENT_SCOPE)
-    else()
-      set(CMAKE_${lang}_COMPILER "CMAKE_${lang}_COMPILER-NOTFOUND" PARENT_SCOPE)
-    endif()
+  if(CMAKE_${lang}_COMPILER_ID_TOOL)
+    set(CMAKE_${lang}_COMPILER "${CMAKE_${lang}_COMPILER_ID_TOOL}" PARENT_SCOPE)
+  elseif(NOT CMAKE_${lang}_COMPILER)
+    set(CMAKE_${lang}_COMPILER "CMAKE_${lang}_COMPILER-NOTFOUND" PARENT_SCOPE)
   endif()
 
   set(CMAKE_${lang}_COMPILER_ID "${CMAKE_${lang}_COMPILER_ID}" PARENT_SCOPE)

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

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake