[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2190-g6bb5632

[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  6bb5632ed61cac314fe81da4a90f867b38db3bf4 (commit)
       via  784827d212fd1769b985516acfe2a3f48f855e41 (commit)
      from  c4f5db7c079fc6e899e15d5e4ec8e5f351da0801 (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=6bb5632ed61cac314fe81da4a90f867b38db3bf4
commit 6bb5632ed61cac314fe81da4a90f867b38db3bf4
Merge: c4f5db7 784827d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 19 08:13:48 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 19 08:13:48 2013 -0500

    Merge topic 'compiler-change-cleanup' into next
    
    784827d Fix RunCMake.CompilerChange test when CC is in environment


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=784827d212fd1769b985516acfe2a3f48f855e41
commit 784827d212fd1769b985516acfe2a3f48f855e41
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 19 08:10:40 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 19 08:10:40 2013 -0500

    Fix RunCMake.CompilerChange test when CC is in environment
    
    The EmptyCompiler portion of the test expects that no compiler
    will be found when CMAKE_C_COMPILER="".  Hide any CC environment
    variable during the test to prevent it from finding a compiler.

diff --git a/Tests/RunCMake/CompilerChange/RunCMakeTest.cmake b/Tests/RunCMake/CompilerChange/RunCMakeTest.cmake
index 75a4ffc..d383716 100644
--- a/Tests/RunCMake/CompilerChange/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompilerChange/RunCMakeTest.cmake
@@ -13,6 +13,9 @@ if(NOT EXISTS "${CMAKE_C_COMPILER}")
   message(FATAL_ERROR "FindCompiler provided non-existing path \"${CMAKE_C_COMPILER}\"!")
 endif()
 
+# Now that we have the full compiler path, hide CC.
+unset(ENV{CC})
+
 # Wrap around the real compiler so we can change the compiler
 # path without changing the underlying compiler.
 set(ccIn ${RunCMake_SOURCE_DIR}/cc.sh.in)

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

Summary of changes:
 Tests/RunCMake/CompilerChange/RunCMakeTest.cmake |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake