diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 2bdc928edf..9945305db4 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -2375,33 +2375,6 @@ void cmSystemTools::EnsureStdPipes() } #endif -void cmSystemTools::DoNotInheritStdPipes() -{ -#ifdef _WIN32 - // Check to see if we are attached to a console - // if so, then do not stop the inherited pipes - // or stdout and stderr will not show up in dos - // shell windows - CONSOLE_SCREEN_BUFFER_INFO hOutInfo; - HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE); - if (GetConsoleScreenBufferInfo(hOut, &hOutInfo)) { - return; - } - { - HANDLE out = GetStdHandle(STD_OUTPUT_HANDLE); - DuplicateHandle(GetCurrentProcess(), out, GetCurrentProcess(), &out, 0, - FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); - SetStdHandle(STD_OUTPUT_HANDLE, out); - } - { - HANDLE out = GetStdHandle(STD_ERROR_HANDLE); - DuplicateHandle(GetCurrentProcess(), out, GetCurrentProcess(), &out, 0, - FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); - SetStdHandle(STD_ERROR_HANDLE, out); - } -#endif -} - #ifdef _WIN32 # ifndef CRYPT_SILENT # define CRYPT_SILENT 0x40 /* Not defined by VS 6 version of header. */ diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index 9563fd6393..0f96500204 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -494,12 +494,6 @@ public: const std::vector& files, cmTarExtractTimestamps extractTimestamps, bool verbose); - // This should be called first thing in main - // it will keep child processes from inheriting the - // stdin and stdout of this process. This is important - // if you want to be able to kill child processes and - // not get stuck waiting for all the output on the pipes. - static void DoNotInheritStdPipes(); static void EnsureStdPipes(); diff --git a/Source/ctest.cxx b/Source/ctest.cxx index fa38a650fb..55defe781e 100644 --- a/Source/ctest.cxx +++ b/Source/ctest.cxx @@ -173,7 +173,6 @@ int main(int argc, char const* const* argv) argc = encoding_args.argc(); argv = encoding_args.argv(); - cmSystemTools::DoNotInheritStdPipes(); cmSystemTools::InitializeLibUV(); cmSystemTools::FindCMakeResources(argv[0]);