Przeglądaj źródła

new message command

Ken Martin 24 lat temu
rodzic
commit
ba9aad7c99
2 zmienionych plików z 12 dodań i 5 usunięć
  1. 7 5
      Source/cmSystemTools.cxx
  2. 5 0
      Source/cmSystemTools.h

+ 7 - 5
Source/cmSystemTools.cxx

@@ -542,16 +542,18 @@ void cmSystemTools::Error(const char* m1, const char* m2,
     message += m4;
     }
   cmSystemTools::s_ErrorOccured = true;
+  cmSystemTools::Message(message.c_str(),"Error");
+}
+
+void cmSystemTools::Message(const char* m1, const char *title)
+{
 #if defined(_WIN32) && !defined(__CYGWIN__)
-  ::MessageBox(0, message.c_str(), 0, MB_OK);
-  std::cerr << message.c_str() << std::endl;
-#else
-  std::cerr << message.c_str() << std::endl;
+  ::MessageBox(0, m1, title, MB_OK);
 #endif
+  std::cerr << m1 << std::endl;
 }
 
 
-
 void cmSystemTools::CopyFileIfDifferent(const char* source,
                                         const char* destination)
 {

+ 5 - 0
Source/cmSystemTools.h

@@ -139,6 +139,11 @@ public:
   static void Error(const char* m, const char* m2=0,
                     const char* m3=0, const char* m4=0);
 
+  /**
+   * Display a message.
+   */
+  static void Message(const char* m, const char* title=0);
+
   ///! Return true if there was an error at any point.
   static bool GetErrorOccuredFlag() 
     {