[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-337-gc6cc9a8

Brad King brad.king at kitware.com
Mon Feb 20 15:16:35 EST 2017


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  c6cc9a81c33e734135f2bac358adc6f73ad2194c (commit)
       via  41d379a8ebade12bf8b798b754ab13ea80629e04 (commit)
      from  23f45e62c9a7597f257b3da5f3cb82d15f6c167e (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=c6cc9a81c33e734135f2bac358adc6f73ad2194c
commit c6cc9a81c33e734135f2bac358adc6f73ad2194c
Merge: 23f45e6 41d379a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 15:16:34 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 20 15:16:34 2017 -0500

    Merge topic 'autogen_json' into next
    
    41d379a8 fixup! Autogen: Overhaul and simplify AutogenInfo.cmake file generation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41d379a8ebade12bf8b798b754ab13ea80629e04
commit 41d379a8ebade12bf8b798b754ab13ea80629e04
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 15:15:34 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 20 15:15:34 2017 -0500

    fixup! Autogen: Overhaul and simplify AutogenInfo.cmake file generation

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index cad0911..c9d1c24 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -133,7 +133,7 @@ static void AddDefinitionEscaped(cmMakefile* makefile, const char* key,
 }
 
 static void AddDefinitionEscaped(cmMakefile* makefile, const char* key,
-                                 const std::vector<std::string> values)
+                                 const std::vector<std::string>& values)
 {
   makefile->AddDefinition(
     key, cmOutputConverter::EscapeForCMake(cmJoin(values, ";")).c_str());

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

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list