diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-16 19:00:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-16 19:00:00 (GMT) |
| commit | 92199485c01e701fa850a7714d70e3cb342b76c8 (patch) | |
| tree | 7e3993984875ab11af8b0d0b8d633a252a1e9a4d | |
| parent | 4f769d18d12eafb377a1105f26b39f949fb0ca15 (diff) | |
| parent | a75a0a14484a7f11961430006fad602099d22f6c (diff) | |
| download | CMake-92199485c01e701fa850a7714d70e3cb342b76c8.zip CMake-92199485c01e701fa850a7714d70e3cb342b76c8.tar.gz CMake-92199485c01e701fa850a7714d70e3cb342b76c8.tar.bz2 | |
Merge topic 'custom-command-slashes'
a75a0a1 Normalize add_custom_command OUTPUT names (#10485)
| -rw-r--r-- | Source/cmAddCustomCommandCommand.cxx | 1 | ||||
| -rw-r--r-- | Tests/CustomCommand/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 1 deletions
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 |