[Cmake-commits] CMake branch, next, updated. v2.8.12-4772-gcc7cd73

[Nils Gladitz]

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  cc7cd7388b07d6d311a7db9efe632f66e68ccaff (commit)
       via  03fa9d2b605818382ca7e9a853298f3f9201da5b (commit)
      from  91405fc47d89e43ac1779d4b306c30eaf13b7cbf (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=cc7cd7388b07d6d311a7db9efe632f66e68ccaff
commit cc7cd7388b07d6d311a7db9efe632f66e68ccaff
Merge: 91405fc 03fa9d2
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Nov 2 08:04:49 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 2 08:04:49 2013 -0400

    Merge topic 'robust-ctest_empty_binary_directory' into next
    
    03fa9d2 CTest: consider non existing target directory a success


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03fa9d2b605818382ca7e9a853298f3f9201da5b
commit 03fa9d2b605818382ca7e9a853298f3f9201da5b
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Nov 2 12:51:31 2013 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Sat Nov 2 12:51:31 2013 +0100

    CTest: consider non existing target directory a success

diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index bae3de7..7d33cf3 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -1057,6 +1057,12 @@ bool cmCTestScriptHandler::EmptyBinaryDirectory(const char *sname)
     return false;
     }
 
+  // consider non existing target directory a success
+  if(!cmSystemTools::FileExists(sname))
+    {
+    return true;
+    }
+
   // try to avoid deleting directories that we shouldn't
   std::string check = sname;
   check += "/CMakeCache.txt";

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

Summary of changes:
 Source/CTest/cmCTestScriptHandler.cxx |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake