[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-345-g917c6f2

Brad King brad.king at kitware.com
Mon Feb 20 15:51:55 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  917c6f27af57d87800cdcd066350e4bdce16027c (commit)
       via  377cd92a1705a3e75e218f25941f9009816c6182 (commit)
       via  f50ac2dd0f3d3776f062487722cb1f86d7dbfd31 (commit)
      from  c60b61be56000aef36904fdc04eb5bde79b3e1dc (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=917c6f27af57d87800cdcd066350e4bdce16027c
commit 917c6f27af57d87800cdcd066350e4bdce16027c
Merge: c60b61b 377cd92
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 15:51:55 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 20 15:51:55 2017 -0500

    Merge topic 'autogen_json' into next
    
    377cd92a fixup! Autogen: Overhaul and simplify AutogenInfo.cmake file generation
    f50ac2dd fixup! Autogen: Overhaul moc include list generation


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

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

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index c9d1c24..52112ff 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -22,7 +22,6 @@
 #endif
 
 #include <algorithm>
-#include <assert.h>
 #include <cmConfigure.h>
 #include <cmsys/FStream.hxx>
 #include <cmsys/RegularExpression.hxx>

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

    fixup! Autogen: Overhaul moc include list generation

diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 2021e4a..236d4c5 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -7,7 +7,6 @@
 #include <cmFilePathChecksum.h>
 #include <cmsys/RegularExpression.hxx>
 
-#include <list>
 #include <map>
 #include <set>
 #include <string>

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

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx |    1 -
 Source/cmQtAutoGenerators.h             |    1 -
 2 files changed, 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list