[Cmake-commits] CMake branch, next, updated. v2.8.3-1463-g585e0ec

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  585e0ec5065496f7508b7f75c6e653faa517c1cd (commit)
       via  2ca116189f26e758a47d4737afe21853d0676235 (commit)
      from  196a6f232f89257dfb86a4d2c8fb547ebfbb0592 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=585e0ec5065496f7508b7f75c6e653faa517c1cd
commit 585e0ec5065496f7508b7f75c6e653faa517c1cd
Merge: 196a6f2 2ca1161
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jan 21 17:01:56 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 21 17:01:56 2011 -0500

    Merge topic 'enable-using-devenv-as-cmakemakeprogram' into next
    
    2ca1161 VS10: Enable using devenv as CMAKE_MAKE_PROGRAM (#11459)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ca116189f26e758a47d4737afe21853d0676235
commit 2ca116189f26e758a47d4737afe21853d0676235
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jan 21 13:18:06 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Jan 21 13:18:06 2011 -0500

    VS10: Enable using devenv as CMAKE_MAKE_PROGRAM (#11459)
    
    If CMAKE_MAKE_PROGRAM is set to devenv, then GenerateBuildCommand
    uses it just like we used to do for VS8 and VS9. Otherwise, it
    still uses MSBuild.
    
    This will let us run the CMake test suite through devenv and make
    sure all the solution and project files we generate are load-able
    and build-able by the VS 2010 IDE, not just MSBuild.
    
    Inspired-By: Robert Lenhardt

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

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio10Generator.cxx |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake