瀏覽代碼

When doing try compile disable output

Andy Cedilnik 23 年之前
父節點
當前提交
f5c6dfcb1c
共有 1 個文件被更改,包括 18 次插入0 次删除
  1. 18 0
      Source/cmMakefile.cxx

+ 18 - 0
Source/cmMakefile.cxx

@@ -1342,6 +1342,8 @@ int cmMakefile::TryCompile(const char *srcdir, const char *bindir,
                            const char *projectName, const char *targetName,
                            const std::vector<std::string> *cmakeArgs)
 {
+  bool output = cmSystemTools::GetRunCommandOutput();
+  cmSystemTools::DisableRunCommandOutput();
   // does the binary directory exist ? If not create it...
   if (!cmSystemTools::FileIsDirectory(bindir))
     {
@@ -1367,6 +1369,10 @@ int cmMakefile::TryCompile(const char *srcdir, const char *bindir,
       "Internal CMake error, TryCompile bad GlobalGenerator");
     // return to the original directory
     cmSystemTools::ChangeDirectory(cwd.c_str());
+    if ( output )
+      {
+      cmSystemTools::EnableRunCommandOutput();
+      }
     return 1;
     }
   cm.SetGlobalGenerator(gg);
@@ -1393,6 +1399,10 @@ int cmMakefile::TryCompile(const char *srcdir, const char *bindir,
       "Internal CMake error, TryCompile configure of cmake failed");
     // return to the original directory
     cmSystemTools::ChangeDirectory(cwd.c_str());
+    if ( output )
+      {
+      cmSystemTools::EnableRunCommandOutput();
+      }
     return 1;
     }
 
@@ -1402,6 +1412,10 @@ int cmMakefile::TryCompile(const char *srcdir, const char *bindir,
       "Internal CMake error, TryCompile generation of cmake failed");
     // return to the original directory
     cmSystemTools::ChangeDirectory(cwd.c_str());
+    if ( output )
+      {
+      cmSystemTools::EnableRunCommandOutput();
+      }
     return 1;
     }
 
@@ -1412,6 +1426,10 @@ int cmMakefile::TryCompile(const char *srcdir, const char *bindir,
                                                        targetName);
 
   cmSystemTools::ChangeDirectory(cwd.c_str());
+  if ( output )
+    {
+    cmSystemTools::EnableRunCommandOutput();
+    }
   return ret;
 }