[cmake-commits] king committed cmGlobalMinGWMakefileGenerator.cxx 1.8 1.9 cmLocalUnixMakefileGenerator3.cxx 1.182 1.183 cmLocalUnixMakefileGenerator3.h 1.62 1.63

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv12243

Modified Files:
	cmGlobalMinGWMakefileGenerator.cxx 
	cmLocalUnixMakefileGenerator3.cxx 
	cmLocalUnixMakefileGenerator3.h 
Log Message:
BUG: Juse use cmake -E echo instead of the native echo on MinGW makefiles.  The echo; hack did not work when running from ctest.


Index: cmLocalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- cmLocalUnixMakefileGenerator3.h	5 Oct 2006 18:51:20 -0000	1.62
+++ cmLocalUnixMakefileGenerator3.h	13 Oct 2006 14:22:45 -0000	1.63
@@ -135,8 +135,8 @@
    * should include all parts of the command up to the beginning of
    * the message (including a whitespace separator).
    */
-  void SetNativeEchoCommand(const char* cmd)
-    { this->NativeEchoCommand = cmd; }
+  void SetNativeEchoCommand(const char* cmd, bool isWindows)
+    { this->NativeEchoCommand = cmd; this->NativeEchoWindows = isWindows; }
 
   /**
    * Set the string used to include one makefile into another default
@@ -341,6 +341,7 @@
   std::string LibraryOutputPath;
   std::string ConfigurationName;
   std::string NativeEchoCommand;
+  bool NativeEchoWindows;
   bool DefineWindowsNULL;
   bool UnixCD;
   bool PassMakeflags;

Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -d -r1.182 -r1.183
--- cmLocalUnixMakefileGenerator3.cxx	10 Oct 2006 17:47:50 -0000	1.182
+++ cmLocalUnixMakefileGenerator3.cxx	13 Oct 2006 14:22:45 -0000	1.183
@@ -51,6 +51,7 @@
   this->SkipPreprocessedSourceRules = false;
   this->SkipAssemblySourceRules = false;
   this->NativeEchoCommand = "@echo ";
+  this->NativeEchoWindows = true;
 }
 
 //----------------------------------------------------------------------------
@@ -1046,7 +1047,8 @@
           {
           // Use the native echo command.
           cmd = this->NativeEchoCommand;
-          cmd += this->EscapeForShell(line.c_str(), false, true);
+          cmd += this->EscapeForShell(line.c_str(), false,
+                                      this->NativeEchoWindows);
           }
         else
           {

Index: cmGlobalMinGWMakefileGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalMinGWMakefileGenerator.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cmGlobalMinGWMakefileGenerator.cxx	5 Oct 2006 18:51:20 -0000	1.8
+++ cmGlobalMinGWMakefileGenerator.cxx	13 Oct 2006 14:22:45 -0000	1.9
@@ -70,13 +70,9 @@
   //
   //  @echo "message with spaces"
   //
-  // it runs but the quotes are displayed.  Instead we can separate
-  // with a semicolon
-  //
-  //  @echo;message with spaces
-  //
-  // to hack around the problem.
-  lg->SetNativeEchoCommand("@echo;");
+  // it runs but the quotes are displayed.  Instead just use cmake to
+  // echo.
+  lg->SetNativeEchoCommand("@$(CMAKE_COMMAND) -E echo ", false);
   return lg;
 }