[Cmake-commits] CMake branch, master, updated. v3.5.2-763-g6052e4b
Brad King
brad.king at kitware.com
Wed May 25 09:34:31 EDT 2016
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, master has been updated
via 6052e4b3bfe62a8d29ca679affb101c7aec0d219 (commit)
via 5784747d1b0404a0c1cb0223b15b823476023fba (commit)
via 5cec953e6aafd4c132a7b6c0a929d95c1dee79ea (commit)
via 2a1a2033afe73da08af46e12ed77a8f55a89417f (commit)
via 34bc6e1f3b2564abfcc79e7724697c2657a56129 (commit)
from 9ebc2092885fa32eaa47aade965fcec2cfa308d0 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6052e4b3bfe62a8d29ca679affb101c7aec0d219
commit 6052e4b3bfe62a8d29ca679affb101c7aec0d219
Merge: 9ebc209 5784747
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed May 25 09:34:29 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 25 09:34:29 2016 -0400
Merge topic 'improve-character-find-and-replace'
5784747d Improve string find: prefer character overloads.
5cec953e Use std::replace for replacing chars in strings.
2a1a2033 cmExtraEclipseCDT4Generator: use std::replace.
34bc6e1f cmCTestScriptHandler: don't call find repeatedly.
diff --cc Source/cmLocalUnixMakefileGenerator3.cxx
index 8d4955b,46891b7..653ea40
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@@ -960,11 -949,11 +960,11 @@@ void cmLocalUnixMakefileGenerator3::App
cmSystemTools::ReplaceString(cmd, "/./", "/");
// Convert the command to a relative path only if the current
// working directory will be the start-output directory.
- bool had_slash = cmd.find("/") != cmd.npos;
+ bool had_slash = cmd.find('/') != cmd.npos;
if (workingDir.empty()) {
- cmd = this->Convert(cmd, START_OUTPUT);
+ cmd = this->Convert(cmd, cmOutputConverter::START_OUTPUT);
}
- bool has_slash = cmd.find("/") != cmd.npos;
+ bool has_slash = cmd.find('/') != cmd.npos;
if (had_slash && !has_slash) {
// This command was specified as a path to a file in the
// current directory. Add a leading "./" so it can run
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/IFW/cmCPackIFWPackage.cxx | 6 +++---
Source/CPack/cmCPackNSISGenerator.cxx | 10 +++++-----
Source/CPack/cmCPackRPMGenerator.cxx | 4 ++--
Source/CPack/cpack.cxx | 2 +-
Source/CTest/cmCTestBuildHandler.cxx | 2 +-
Source/CTest/cmCTestCoverageHandler.cxx | 4 ++--
Source/CTest/cmCTestScriptHandler.cxx | 7 ++++---
Source/CTest/cmCTestSubmitHandler.cxx | 4 ++--
Source/CTest/cmCTestTestHandler.cxx | 2 +-
Source/CTest/cmParseDelphiCoverage.cxx | 2 +-
Source/CursesDialog/cmCursesMainForm.cxx | 2 +-
Source/cmBuildNameCommand.cxx | 12 ++++++------
Source/cmCTest.cxx | 4 ++--
Source/cmCreateTestSourceList.cxx | 6 +++---
Source/cmDependsFortran.cxx | 2 +-
Source/cmExportFileGenerator.cxx | 8 ++++----
Source/cmExtraEclipseCDT4Generator.cxx | 6 +-----
Source/cmGeneratorExpression.cxx | 4 ++--
Source/cmGeneratorTarget.cxx | 2 +-
Source/cmGlobalGhsMultiGenerator.cxx | 4 ++--
Source/cmGlobalNinjaGenerator.cxx | 8 ++++----
Source/cmGlobalVisualStudio7Generator.cxx | 2 +-
Source/cmGlobalVisualStudioGenerator.cxx | 2 +-
Source/cmGlobalXCodeGenerator.cxx | 2 +-
Source/cmInstallExportGenerator.cxx | 4 ++--
Source/cmLocalGenerator.cxx | 12 ++++++------
Source/cmLocalNinjaGenerator.cxx | 2 +-
Source/cmLocalUnixMakefileGenerator3.cxx | 12 ++++++------
Source/cmMakefileTargetGenerator.cxx | 6 +++---
Source/cmNinjaTargetGenerator.cxx | 2 +-
Source/cmQtAutoGenerators.cxx | 2 +-
Source/cmSeparateArgumentsCommand.cxx | 2 +-
Source/cmSystemTools.cxx | 2 +-
Source/cmVisualStudio10TargetGenerator.cxx | 2 +-
Source/cmVisualStudioWCEPlatformParser.cxx | 4 ++--
Source/cmcmd.cxx | 2 +-
36 files changed, 78 insertions(+), 81 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list