kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle trailing slashes on add_custom_command DEPENDS

This commit is contained in:
Brad King 2011-01-26 16:29:52 -05:00
parent f0acf05656
commit 7befc00783
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmLocalGenerator.cxx
View File

@ -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;
}

14
Tests/CustomCommandWorkingDirectory/CMakeLists.txt
View File

@ -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)