summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2002-10-02 15:15:07 (GMT)
committerKen Martin <ken.martin@kitware.com>2002-10-02 15:15:07 (GMT)
commit8cac76825f335148548bb2bb1491b1a220de6187 (patch)
tree3c46759a9686b4a05f21035b4218e4d85ece9616
parent047acd0c6f6acc004f12e3ad7fa4461688ca7b1f (diff)
downloadCMake-8cac76825f335148548bb2bb1491b1a220de6187.zip
CMake-8cac76825f335148548bb2bb1491b1a220de6187.tar.gz
CMake-8cac76825f335148548bb2bb1491b1a220de6187.tar.bz2
Fix bug in borland run command
-rw-r--r--Source/cmSystemTools.cxx15
1 files changed, 6 insertions, 9 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 748b95f..cc24ddb 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1414,12 +1414,6 @@ bool WindowsRunCommand(const char* command, const char* dir,
//main program loop
{
Sleep(10);
- //std::cout << "Check for process..." << std::endl;
- GetExitCodeProcess(pi.hProcess,&exit);
-
-//while the process is running
- if (exit != STILL_ACTIVE) break;
-
//check to see if there is any data to read from stdout
//std::cout << "Peek for data..." << std::endl;
PeekNamedPipe(read_stdout,buf,1023,&bread,&avail,NULL);
@@ -1441,23 +1435,26 @@ bool WindowsRunCommand(const char* command, const char* dir,
std::cout << buf << std::flush;
}
}
- output += "\n";
}
else
{
ReadFile(read_stdout,buf,1023,&bread,NULL);
output += buf;
- output += "\n";
if(verbose)
{
std::cout << buf << std::flush;
-
}
}
}
+ //std::cout << "Check for process..." << std::endl;
+ GetExitCodeProcess(pi.hProcess,&exit);
+
+//while the process is running
+ if (exit != STILL_ACTIVE) break;
+
}
CloseHandle(pi.hThread);
CloseHandle(pi.hProcess);