[Cmake-commits] CMake branch, next, updated. v2.8.3-897-g78858b0

[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  78858b0876646bbbff2a23470c9d16df526d2338 (commit)
       via  a75a0a14484a7f11961430006fad602099d22f6c (commit)
      from  e44b7251aac1378539178256db7a48c390c0cf82 (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=78858b0876646bbbff2a23470c9d16df526d2338
commit 78858b0876646bbbff2a23470c9d16df526d2338
Merge: e44b725 a75a0a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 15 08:50:35 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 15 08:50:35 2010 -0500

    Merge topic 'custom-command-slashes' into next
    
    a75a0a1 Normalize add_custom_command OUTPUT names (#10485)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a75a0a14484a7f11961430006fad602099d22f6c
commit a75a0a14484a7f11961430006fad602099d22f6c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 15 08:44:57 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 15 08:44:57 2010 -0500

    Normalize add_custom_command OUTPUT names (#10485)
    
    Previously the OUTPUT arguments of add_custom_command were not
    slash-normalized but those of add_library and add_executable were.
    This caused the example
    
      add_custom_command(OUTPUT a//b.c ...)
      add_library(... a//b.c ...)
    
    to fail at build time with "no rule to make a/b.c".  Fix this and modify
    the CustomCommand test to try it.

diff --git a/Source/cmAddCustomCommandCommand.cxx b/Source/cmAddCustomCommandCommand.cxx
index f6b3234..7af6ec8 100644
--- a/Source/cmAddCustomCommandCommand.cxx
+++ b/Source/cmAddCustomCommandCommand.cxx
@@ -161,6 +161,7 @@ bool cmAddCustomCommandCommand
             filename += "/";
             }
           filename += copy;
+          cmSystemTools::ConvertToUnixSlashes(filename);
           break;
         case doing_source:
           // We do not want to convert the argument to SOURCE because
diff --git a/Tests/CustomCommand/CMakeLists.txt b/Tests/CustomCommand/CMakeLists.txt
index 746c9a7..13f4233 100644
--- a/Tests/CustomCommand/CMakeLists.txt
+++ b/Tests/CustomCommand/CMakeLists.txt
@@ -55,7 +55,7 @@ ADD_CUSTOM_COMMAND(
 #  Test creating files from a custom target
 #
 ################################################################
-ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/doc1.dvi
+ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}//doc1.dvi # test 2 slashes
   DEPENDS ${PROJECT_SOURCE_DIR}/doc1.tex 
   COMMAND   ${CMAKE_COMMAND}  
   ARGS      -E copy ${PROJECT_SOURCE_DIR}/doc1.tex 

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

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


hooks/post-receive
-- 
CMake