[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3272-g359b1be

[Robert Maynard]

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  359b1be39a766605f4809aa5d197705a73bbb5da (commit)
       via  b67626acf13a7aa51fc6200ce11e807acc53b55f (commit)
       via  0efccb2b963866506cf9a49b3a9c90c427bb01d4 (commit)
      from  5ff359aa44572a4e99336c71ebe5ac53e337235a (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=359b1be39a766605f4809aa5d197705a73bbb5da
commit 359b1be39a766605f4809aa5d197705a73bbb5da
Merge: 5ff359a b67626a
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Wed May 21 09:37:35 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 21 09:37:35 2014 -0400

    Merge topic 'normalize_custom_command_paths' into next
    
    b67626ac Unify all paths that custom command uses to be full paths.
    0efccb2b Add a test to expose the custom command issue with paths.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b67626acf13a7aa51fc6200ce11e807acc53b55f
commit b67626acf13a7aa51fc6200ce11e807acc53b55f
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon May 19 17:13:23 2014 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Wed May 21 09:18:17 2014 -0400

    Unify all paths that custom command uses to be full paths.

diff --git a/Source/cmAddCustomCommandCommand.cxx b/Source/cmAddCustomCommandCommand.cxx
index d5f00ff..623455f 100644
--- a/Source/cmAddCustomCommandCommand.cxx
+++ b/Source/cmAddCustomCommandCommand.cxx
@@ -162,6 +162,10 @@ bool cmAddCustomCommandCommand
             }
           filename += copy;
           cmSystemTools::ConvertToUnixSlashes(filename);
+          if (cmSystemTools::FileIsFullPath(filename.c_str()))
+            {
+            filename = cmSystemTools::CollapseFullPath(filename.c_str());
+            }
           break;
         case doing_source:
           // We do not want to convert the argument to SOURCE because
@@ -197,6 +201,10 @@ bool cmAddCustomCommandCommand
            // explicit dependency.
            std::string dep = copy;
            cmSystemTools::ConvertToUnixSlashes(dep);
+           if (cmSystemTools::FileIsFullPath(dep.c_str()))
+            {
+            dep = cmSystemTools::CollapseFullPath(dep.c_str());
+            }
            depends.push_back(dep);
 
            // Add the implicit dependency language and file.
@@ -218,7 +226,11 @@ bool cmAddCustomCommandCommand
            {
            std::string dep = copy;
            cmSystemTools::ConvertToUnixSlashes(dep);
-           depends.push_back(dep);
+           if (cmSystemTools::FileIsFullPath(dep.c_str()))
+            {
+            dep = cmSystemTools::CollapseFullPath(dep.c_str());
+            }
+           depends.push_back( dep );
            }
            break;
          case doing_outputs:

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0efccb2b963866506cf9a49b3a9c90c427bb01d4
commit 0efccb2b963866506cf9a49b3a9c90c427bb01d4
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Wed May 21 09:17:49 2014 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Wed May 21 09:18:17 2014 -0400

    Add a test to expose the custom command issue with paths.

diff --git a/Tests/CustomCommand/CMakeLists.txt b/Tests/CustomCommand/CMakeLists.txt
index e0854ce..4f4fb26 100644
--- a/Tests/CustomCommand/CMakeLists.txt
+++ b/Tests/CustomCommand/CMakeLists.txt
@@ -135,10 +135,10 @@ add_dependencies(doc3Post TDocument)
 
 ################################################################
 #
-#  Test using a multistep generated file
+#  Test using a multistep generated file with collapsible path
 #
 ################################################################
-add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/foo.pre
+add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}//./foo.pre
   DEPENDS ${PROJECT_SOURCE_DIR}/foo.in
           TDocument # Ensure doc1.h generates before this target
   COMMAND   ${CMAKE_COMMAND}

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

Summary of changes:
 Source/cmAddCustomCommandCommand.cxx |   14 +++++++++++++-
 Tests/CustomCommand/CMakeLists.txt   |    4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake