From 7befc00783ca9739e7585ff4d2b645a762a38396 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 26 Jan 2011 16:29:52 -0500
Subject: [PATCH] Handle trailing slashes on add_custom_command DEPENDS

---
 Source/cmLocalGenerator.cxx                        |  1 +
 Tests/CustomCommandWorkingDirectory/CMakeLists.txt | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index d3cbc1ff7..cd265c16c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1893,6 +1893,7 @@ bool cmLocalGenerator::GetRealDependency(const char* inName,
     {
     // This is a full path.  Return it as given.
     dep = inName;
+    cmSystemTools::ConvertToUnixSlashes(dep);
     return true;
     }
 
diff --git a/Tests/CustomCommandWorkingDirectory/CMakeLists.txt b/Tests/CustomCommandWorkingDirectory/CMakeLists.txt
index 57cb712ab..d272ffe3c 100644
--- a/Tests/CustomCommandWorkingDirectory/CMakeLists.txt
+++ b/Tests/CustomCommandWorkingDirectory/CMakeLists.txt
@@ -9,8 +9,7 @@ ADD_CUSTOM_COMMAND(
 )
 
 SET_SOURCE_FILES_PROPERTIES(
-  "${TestWorkingDir_BINARY_DIR}/working.c" 
-  "${TestWorkingDir_BINARY_DIR}/customTarget.c" 
+  "${TestWorkingDir_BINARY_DIR}/customTarget.c"
   PROPERTIES GENERATED 1)
 
 ADD_EXECUTABLE(working "${TestWorkingDir_BINARY_DIR}/working.c" 
@@ -23,3 +22,14 @@ ADD_CUSTOM_TARGET(
 )
 
 ADD_DEPENDENCIES(working Custom)
+
+file(MAKE_DIRECTORY ${TestWorkingDir_BINARY_DIR}/work)
+add_custom_command(
+  OUTPUT working2.c # Relative to build tree
+  COMMAND "${CMAKE_COMMAND}" -E copy ${TestWorkingDir_SOURCE_DIR}/working.c.in ../working2.c
+  DEPENDS ${TestWorkingDir_SOURCE_DIR}/working.c.in/ # trailing slash should be removed
+  WORKING_DIRECTORY ${TestWorkingDir_BINARY_DIR}/work
+  )
+add_executable(working2 working2.c ${TestWorkingDir_BINARY_DIR}/customTarget.c)
+
+add_dependencies(working2 Custom2)