[Cmake-commits] CMake branch, next, updated. v2.8.4-1820-g8eef0ba

[Bill Hoffman]

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  8eef0ba1321f8c995d1b3852206bd631351731a6 (commit)
       via  8555c2b4b768037a37705ef7f2486149ae3cdc13 (commit)
      from  d9e32669c6492a3650ce46ac00f129d0c0168b0b (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=8eef0ba1321f8c995d1b3852206bd631351731a6
commit 8eef0ba1321f8c995d1b3852206bd631351731a6
Merge: d9e3266 8555c2b
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jun 23 15:31:48 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 23 15:31:48 2011 -0400

    Merge topic 'use_devenv_forvs2010' into next
    
    8555c2b Look for VCExpress as a possible build tool as well as devenv.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8555c2b4b768037a37705ef7f2486149ae3cdc13
commit 8555c2b4b768037a37705ef7f2486149ae3cdc13
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jun 23 15:29:25 2011 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Thu Jun 23 15:29:25 2011 -0400

    Look for VCExpress as a possible build tool as well as devenv.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 6c3c1ed..328a3da 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -123,7 +123,8 @@ std::string cmGlobalVisualStudio10Generator
   cmSystemTools::LowerCase(lowerCaseCommand);
 
   // If makeProgram is devenv, parent class knows how to generate command:
-  if (lowerCaseCommand.find("devenv") != std::string::npos)
+  if (lowerCaseCommand.find("devenv") != std::string::npos ||
+      lowerCaseCommand.find("VCExpress") != std::string::npos)
     {
     return cmGlobalVisualStudio7Generator::GenerateBuildCommand(makeProgram,
       projectName, additionalOptions, targetName, config, ignoreErrors, fast);

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

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


hooks/post-receive
-- 
CMake