[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3413-g7a6bf5e

[Stephen Kelly]

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  7a6bf5e9dfda62b661767787ef037301334b96b4 (commit)
       via  9207116a338695627b7ead39ceaedf8bbca96b12 (commit)
      from  a0292f8c46c6e49563c73a03865888eaea2e9be9 (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=7a6bf5e9dfda62b661767787ef037301334b96b4
commit 7a6bf5e9dfda62b661767787ef037301334b96b4
Merge: a0292f8 9207116
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 28 15:08:24 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 28 15:08:24 2014 -0400

    Merge topic 'normalize_custom_command_paths' into next
    
    9207116a Revert topic.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9207116a338695627b7ead39ceaedf8bbca96b12
commit 9207116a338695627b7ead39ceaedf8bbca96b12
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 28 21:07:40 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 28 21:07:53 2014 +0200

    Revert topic.

diff --git a/Source/cmAddCustomCommandCommand.cxx b/Source/cmAddCustomCommandCommand.cxx
index 623455f..d5f00ff 100644
--- a/Source/cmAddCustomCommandCommand.cxx
+++ b/Source/cmAddCustomCommandCommand.cxx
@@ -162,10 +162,6 @@ 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
@@ -201,10 +197,6 @@ 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.
@@ -226,11 +218,7 @@ bool cmAddCustomCommandCommand
            {
            std::string dep = copy;
            cmSystemTools::ConvertToUnixSlashes(dep);
-           if (cmSystemTools::FileIsFullPath(dep.c_str()))
-            {
-            dep = cmSystemTools::CollapseFullPath(dep.c_str());
-            }
-           depends.push_back( dep );
+           depends.push_back(dep);
            }
            break;
          case doing_outputs:
diff --git a/Tests/CustomCommand/CMakeLists.txt b/Tests/CustomCommand/CMakeLists.txt
index 4f4fb26..e0854ce 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 with collapsible path
+#  Test using a multistep generated file
 #
 ################################################################
-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, 3 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake