[Cmake-commits] CMake branch, next, updated. v3.2.1-1220-g631b189

[Brad King]

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  631b189e9f5b905b72c5605ae8cb5db8658a196e (commit)
       via  128cad7e7a34702b9b38b9eaa42a4600de4d183c (commit)
      from  27941d1e43a1ade47c33f97935fee53eeaf8dd51 (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=631b189e9f5b905b72c5605ae8cb5db8658a196e
commit 631b189e9f5b905b72c5605ae8cb5db8658a196e
Merge: 27941d1 128cad7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 25 09:04:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 25 09:04:53 2015 -0400

    Merge topic 'add-GreenHills-MULTI-generator' into next
    
    128cad7e GHS: Fix selection of make program 'gbuild'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=128cad7e7a34702b9b38b9eaa42a4600de4d183c
commit 128cad7e7a34702b9b38b9eaa42a4600de4d183c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 25 08:56:36 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 25 08:56:36 2015 -0400

    GHS: Fix selection of make program 'gbuild'

diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index cec0f8d..b99462b 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -258,7 +258,9 @@ void cmGlobalGhsMultiGenerator::GenerateBuildCommand(
     const std::string &targetName, const std::string & /*config*/,
     bool /*fast*/, bool /*verbose*/,
     std::vector<std::string> const &makeOptions) {
-  makeCommand.push_back(this->SelectMakeProgram(makeProgram));
+  makeCommand.push_back(
+    this->SelectMakeProgram(makeProgram, this->GetGhsBuildCommand())
+    );
 
   makeCommand.insert(makeCommand.end(),
                      makeOptions.begin(), makeOptions.end());

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

Summary of changes:
 Source/cmGlobalGhsMultiGenerator.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake