[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1252-g1a536bf
Brad King
brad.king at kitware.com
Wed Jul 22 10:58:36 EDT 2015
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 1a536bf9d48fdd7d3e325e8765feb95eeedc53e0 (commit)
via c4cbf441827b844cfaa0628478a8557d14d0ea52 (commit)
from 97cf80fd5ec3df4a281452111a6a3968ef0ea872 (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=1a536bf9d48fdd7d3e325e8765feb95eeedc53e0
commit 1a536bf9d48fdd7d3e325e8765feb95eeedc53e0
Merge: 97cf80f c4cbf44
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 22 10:58:35 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 22 10:58:35 2015 -0400
Merge topic 'cmRange-API' into next
c4cbf441 fixup! cmAlgorithms: Rename cmRange to cmMakeRange.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4cbf441827b844cfaa0628478a8557d14d0ea52
commit c4cbf441827b844cfaa0628478a8557d14d0ea52
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 22 10:58:10 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 22 10:58:10 2015 -0400
fixup! cmAlgorithms: Rename cmRange to cmMakeRange.
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 5d66014..7959ffe 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -170,8 +170,8 @@ bool cmFindBase::ParseArguments(std::vector<std::string> const& argsIn)
else
{
this->VariableDocumentation += "one of the ";
- this->VariableDocumentation += cmJoin(cmMakeRange(this->Names).retreat(1),
- ", ");
+ this->VariableDocumentation +=
+ cmJoin(cmMakeRange(this->Names).retreat(1), ", ");
this->VariableDocumentation += " or "
+ this->Names[this->Names.size() - 1] + " libraries be found";
}
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index e89eb12..71f47f3 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -572,7 +572,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
return 1;
}
- std::string command = cmWrap('"', cmMakeRange(args).advance(3), '"', " ");
+ std::string command =
+ cmWrap('"', cmMakeRange(args).advance(3), '"', " ");
int retval = 0;
int timeout = 0;
if ( cmSystemTools::RunSingleCommand(command.c_str(), 0, 0, &retval,
-----------------------------------------------------------------------
Summary of changes:
Source/cmFindBase.cxx | 4 ++--
Source/cmcmd.cxx | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list