Merge topic 'enable-using-devenv-as-cmakemakeprogram'

2ca1161 VS10: Enable using devenv as CMAKE_MAKE_PROGRAM (#11459)

1 files changed, 10 insertions, 5 deletions

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 0b939af..6c3c1ed 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -114,18 +114,23 @@ std::string cmGlobalVisualStudio10Generator
 ::GenerateBuildCommand(const char* makeProgram,
                        const char *projectName, 
                        const char* additionalOptions, const char *targetName,
-                       const char* config, bool ignoreErrors, bool)
+                       const char* config, bool ignoreErrors, bool fast)
 {
-  // Ingoring errors is not implemented in visual studio 6
-  (void) ignoreErrors;
-
-  
   // now build the test
   std::string makeCommand 
     = cmSystemTools::ConvertToOutputPath(makeProgram);
   std::string lowerCaseCommand = makeCommand;
   cmSystemTools::LowerCase(lowerCaseCommand);
 
+  // If makeProgram is devenv, parent class knows how to generate command:
+  if (lowerCaseCommand.find("devenv") != std::string::npos)
+    {
+    return cmGlobalVisualStudio7Generator::GenerateBuildCommand(makeProgram,
+      projectName, additionalOptions, targetName, config, ignoreErrors, fast);
+    }
+
+  // Otherwise, assume MSBuild command line, and construct accordingly.
+
   // if there are spaces in the makeCommand, assume a full path
   // and convert it to a path with no spaces in it as the
   // RunSingleCommand does not like spaces