From 42a00c96c17e03829d2b11a092f49d598ba527b0 Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Wed, 17 Jul 2002 11:53:07 -0400 Subject: Fix changing of directories using cmSystemTools RunCommand feature --- Source/cmake.cxx | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Source/cmake.cxx b/Source/cmake.cxx index fdfc11f..68efa46 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -631,18 +631,15 @@ int cmake::CMakeCommand(std::vector& args) command += args[cc]; } - if ( cmSystemTools::ChangeDirectory( directory.c_str() ) == 0 ) + int retval = 0; + if ( cmSystemTools::RunCommand(command.c_str(), output, retval, + directory.c_str(), true) ) { - std::cout << "Change directory to: " << directory << std::endl; - cmSystemTools::RunCommand(command.c_str(), output, 0, true); std::cout << output.c_str(); - } - else - { - std::cout << "Cannot change directory to: " << directory << std::endl; - } + return retval; + } - return 0; + return 1; } #if defined(_WIN32) && !defined(__CYGWIN__) -- cgit v0.12