diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-02-22 18:38:33 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-02-22 18:38:33 (GMT) |
commit | 8c3400dc6b61cc8bd524ca4f53dc0ef2d6eb6ef1 (patch) | |
tree | baae2486eb444d3d7667aca67ff499a22f27e6f6 /Source/cmaketest.cxx | |
parent | bfcf4b02bfa344c335f86ee6734b1d6c651a93ad (diff) | |
download | CMake-8c3400dc6b61cc8bd524ca4f53dc0ef2d6eb6ef1.zip CMake-8c3400dc6b61cc8bd524ca4f53dc0ef2d6eb6ef1.tar.gz CMake-8c3400dc6b61cc8bd524ca4f53dc0ef2d6eb6ef1.tar.bz2 |
ENH: big change in the path handling, one function CreateOutputPath is used to escape spaces and convert to the native path type
Diffstat (limited to 'Source/cmaketest.cxx')
-rw-r--r-- | Source/cmaketest.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Source/cmaketest.cxx b/Source/cmaketest.cxx index d1372d8..28f9b94 100644 --- a/Source/cmaketest.cxx +++ b/Source/cmaketest.cxx @@ -116,10 +116,7 @@ int main (int argc, char *argv[]) { std::cerr << "Error: cmaketest does not have a valid MAKEPROGRAM\n"; } - makeCommand = cmSystemTools::EscapeSpaces(makeCommand.c_str()); -#if defined(_WIN32) && !defined(__CYGWIN__) - cmSystemTools::ConvertToWindowsSlashes(makeCommand); -#endif + makeCommand = cmSystemTools::ConvertToOutputPath(makeCommand.c_str()); std::string lowerCaseCommand = makeCommand; cmSystemTools::LowerCase(lowerCaseCommand); @@ -246,10 +243,7 @@ int main (int argc, char *argv[]) cmSystemTools::ChangeDirectory(cwd.c_str()); return 1; } - fullPath = cmSystemTools::EscapeSpaces(fullPath.c_str()); -#if defined(_WIN32) && !defined(__CYGWIN__) - cmSystemTools::ConvertToWindowsSlashes(fullPath); -#endif + fullPath = cmSystemTools::ConvertToOutputPath(fullPath.c_str()); std::cout << "Running test executable: " << fullPath.c_str() << "\n"; int ret = 0; if (!cmSystemTools::RunCommand(fullPath.c_str(), output, ret, true)) |