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

BUG: Disable new shell escape code until backward compatibility can be established in the new implementation.

This commit is contained in:
Brad King 2006-09-25 10:22:48 -04:00
parent 97c97730a6
commit c1b4a0bf74
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmLocalGenerator.cxx
View File

@ -2246,6 +2246,20 @@ cmLocalGenerator
std::string cmLocalGenerator::EscapeForShell(const char* str)
{
std::string result;
// Temporarily use old shell escaping code until a means of backward
// compatibility can be established in the new implementation.
#if 1
bool forceOn = cmSystemTools::GetForceUnixPaths();
if(forceOn && this->WindowsShell)
{
cmSystemTools::SetForceUnixPaths(false);
}
result = cmSystemTools::EscapeSpaces(str);
if(forceOn && this->WindowsShell)
{
cmSystemTools::SetForceUnixPaths(true);
}
#else
if(this->WindowsShell)
{
int size = cmsysSystem_Windows_ShellArgumentSize(str);
@ -2264,5 +2278,6 @@ std::string cmLocalGenerator::EscapeForShell(const char* str)
result += *c;
}
}
#endif
return result;
}

2
Tests/CustomCommand/CMakeLists.txt
View File

@ -199,7 +199,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/check_command_line.c.in
@ONLY IMMEDIATE)
ADD_EXECUTABLE(check_command_line
${CMAKE_CURRENT_BINARY_DIR}/check_command_line.c)
ADD_CUSTOM_TARGET(do_check_command_line ALL
ADD_CUSTOM_TARGET(do_check_command_line #ALL
COMMAND ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/check_command_line
${CHECK_ARGS}
)