[Cmake-commits] CMake branch, next, updated. v2.8.11.2-2995-gdb9ca51

[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  db9ca5115aa1cb09d91ecd8d160dd5025241ea87 (commit)
       via  c40493110578c7948e16b8af20049e41a6c39531 (commit)
      from  66e4e69fb4059616b56e7fb0ed129df70827bf78 (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=db9ca5115aa1cb09d91ecd8d160dd5025241ea87
commit db9ca5115aa1cb09d91ecd8d160dd5025241ea87
Merge: 66e4e69 c404931
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 9 16:27:56 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 9 16:27:56 2013 -0400

    Merge topic 'try_compile-COPY_FILE_ERROR' into next
    
    c404931 Fix TryCompile test COPY_FILE_ERROR failure case


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c40493110578c7948e16b8af20049e41a6c39531
commit c40493110578c7948e16b8af20049e41a6c39531
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 9 16:25:17 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 9 16:25:22 2013 -0400

    Fix TryCompile test COPY_FILE_ERROR failure case
    
    Ensure COPY_FILE fails by trying to put it in a directory that
    conflicts with an existing file.

diff --git a/Tests/TryCompile/CMakeLists.txt b/Tests/TryCompile/CMakeLists.txt
index 47af400..173929b 100644
--- a/Tests/TryCompile/CMakeLists.txt
+++ b/Tests/TryCompile/CMakeLists.txt
@@ -46,11 +46,12 @@ endif()
 
 # try to compile a file that should compile
 # also check that COPY_FILE_ERROR works
+file(WRITE ${TryCompile_BINARY_DIR}/invalid "")
 try_compile(SHOULD_PASS
     ${TryCompile_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
     ${TryCompile_SOURCE_DIR}/pass.c
     OUTPUT_VARIABLE TRY_OUT
-    COPY_FILE /invalid/path
+    COPY_FILE ${TryCompile_BINARY_DIR}/invalid/path
     COPY_FILE_ERROR _captured
     )
 if(NOT SHOULD_PASS)

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

Summary of changes:
 Tests/TryCompile/CMakeLists.txt |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake