[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-730-g66fe82a

[Stephen Kelly]

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  66fe82a3adaa0c354c9907371f17c9caa0471e85 (commit)
       via  3bd59b6014c13a3f980b9988ebfca91e0a2936c0 (commit)
       via  bf00f5287b2d0cc2dbd175ab25e7cafbda944f23 (commit)
      from  4226efedb00ae3efe5cdc235f782639133bd5320 (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=66fe82a3adaa0c354c9907371f17c9caa0471e85
commit 66fe82a3adaa0c354c9907371f17c9caa0471e85
Merge: 4226efe 3bd59b6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 18 17:23:59 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 18 17:23:59 2014 -0500

    Merge topic 'clean-autogen' into next
    
    3bd59b60 QtAutogen: Use cmHasLiteral{Prefix,Suffix} where possible.
    bf00f528 QtAutogen: Don't take a reference to temporary.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bd59b6014c13a3f980b9988ebfca91e0a2936c0
commit 3bd59b6014c13a3f980b9988ebfca91e0a2936c0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 14 00:04:57 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 18 23:20:40 2014 +0100

    QtAutogen: Use cmHasLiteral{Prefix,Suffix} where possible.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 3d6445d..f2ed016 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1479,7 +1479,7 @@ void cmQtAutoGenerators::Init()
     {
     const std::string &path = *it;
     this->MocIncludes.push_back("-I" + path);
-    if (this->EndsWith(path, ".framework/Headers"))
+    if (cmHasLiteralSuffix(path, ".framework/Headers"))
       {
       // Go up twice to get to the framework root
       std::vector<std::string> pathComponents;
@@ -1771,7 +1771,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
 
       std::string basename = cmsys::SystemTools::
                                    GetFilenameWithoutLastExtension(currentMoc);
-      const bool moc_style = this->StartsWith(basename, "moc_");
+      const bool moc_style = cmHasLiteralPrefix(basename, "moc_");
 
       // If the moc include is of the moc_foo.cpp style we expect
       // the Q_OBJECT class declaration in a header file.
@@ -1953,7 +1953,7 @@ void cmQtAutoGenerators::StrictParseCppFile(const std::string& absFilename,
 
       std::string basename = cmsys::SystemTools::
                                    GetFilenameWithoutLastExtension(currentMoc);
-      const bool mocUnderscoreStyle = this->StartsWith(basename, "moc_");
+      const bool mocUnderscoreStyle = cmHasLiteralPrefix(basename, "moc_");
 
       // If the moc include is of the moc_foo.cpp style we expect
       // the Q_OBJECT class declaration in a header file.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf00f5287b2d0cc2dbd175ab25e7cafbda944f23
commit bf00f5287b2d0cc2dbd175ab25e7cafbda944f23
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 14 00:03:28 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 18 23:20:40 2014 +0100

    QtAutogen: Don't take a reference to temporary.
    
    While a const reference to a temporary is standard conformant,
    it doesn't seem to be necessary or advantageous here.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 929cbc0..3d6445d 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1500,7 +1500,7 @@ void cmQtAutoGenerators::Init()
 
     if (this->IncludeProjectDirsBefore)
       {
-      const std::string &binDir = "-I" + this->ProjectBinaryDir;
+      const std::string binDir = "-I" + this->ProjectBinaryDir;
 
       const std::string srcDir = "-I" + this->ProjectSourceDir;
 

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

Summary of changes:
 Source/cmQtAutoGenerators.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake