[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1552-gc82716c

[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  c82716c6d1793e4fcf6e046ddba97d9823880374 (commit)
       via  8ff1d4714fb7cd42eb3cd8db041b529e433eb7c8 (commit)
       via  5929086634e362d03d02124eea5ee14919ae5a0f (commit)
      from  e255a96f68ca64f40156feea02b9f07c75aa6316 (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=c82716c6d1793e4fcf6e046ddba97d9823880374
commit c82716c6d1793e4fcf6e046ddba97d9823880374
Merge: e255a96 8ff1d47
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 11 11:03:24 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 11 11:03:24 2013 -0500

    Merge topic 'fix-empty-link-line-crash' into next
    
    8ff1d47 CMake: Skip empty link.txt lines (#13845)
    5929086 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ff1d4714fb7cd42eb3cd8db041b529e433eb7c8
commit 8ff1d4714fb7cd42eb3cd8db041b529e433eb7c8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 11 10:57:39 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 11 10:57:39 2013 -0500

    CMake: Skip empty link.txt lines (#13845)
    
    In the implementation of "cmake -E cmake_link_script", skip lines from
    the input file that are empty or contain only whitespace.  Do not try to
    run a child with no command line.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index a44c825..0acd2fc 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -3299,6 +3299,12 @@ int cmake::ExecuteLinkScript(std::vector<std::string>& args)
   int result = 0;
   while(result == 0 && cmSystemTools::GetLineFromStream(fin, command))
     {
+    // Skip empty command lines.
+    if(command.find_first_not_of(" \t") == command.npos)
+      {
+      continue;
+      }
+
     // Setup this command line.
     const char* cmd[2] = {command.c_str(), 0};
     cmsysProcess_SetCommand(cp, cmd);

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

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


hooks/post-receive
-- 
CMake