BUG: Disable new shell escape code until backward compatibility can be established in the new implementation.
This commit is contained in:
parent
97c97730a6
commit
c1b4a0bf74
|
@ -2246,6 +2246,20 @@ cmLocalGenerator
|
||||||
std::string cmLocalGenerator::EscapeForShell(const char* str)
|
std::string cmLocalGenerator::EscapeForShell(const char* str)
|
||||||
{
|
{
|
||||||
std::string result;
|
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)
|
if(this->WindowsShell)
|
||||||
{
|
{
|
||||||
int size = cmsysSystem_Windows_ShellArgumentSize(str);
|
int size = cmsysSystem_Windows_ShellArgumentSize(str);
|
||||||
|
@ -2264,5 +2278,6 @@ std::string cmLocalGenerator::EscapeForShell(const char* str)
|
||||||
result += *c;
|
result += *c;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -199,7 +199,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/check_command_line.c.in
|
||||||
@ONLY IMMEDIATE)
|
@ONLY IMMEDIATE)
|
||||||
ADD_EXECUTABLE(check_command_line
|
ADD_EXECUTABLE(check_command_line
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/check_command_line.c)
|
${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
|
COMMAND ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/check_command_line
|
||||||
${CHECK_ARGS}
|
${CHECK_ARGS}
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue