[Cmake-commits] CMake branch, next, updated. v3.2.0-883-g9881928

Brad King brad.king at kitware.com
Sat Mar 7 06:49:10 EST 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  9881928d4feb9dadee3c882387dbf64889b18ccd (commit)
       via  c5affc51053911dfa24b5ce9b832494b67db3f63 (commit)
      from  5935b45f7b2be4bc6fbb28d3393e5feab16bbbf5 (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=9881928d4feb9dadee3c882387dbf64889b18ccd
commit 9881928d4feb9dadee3c882387dbf64889b18ccd
Merge: 5935b45 c5affc5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Mar 7 06:49:07 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 7 06:49:07 2015 -0500

    Merge topic 'refactor-GeneratorExpression' into next
    
    c5affc51 cmGeneratorExpressionContext: Fix include order


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5affc51053911dfa24b5ce9b832494b67db3f63
commit c5affc51053911dfa24b5ce9b832494b67db3f63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Mar 7 06:48:15 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Mar 7 06:48:18 2015 -0500

    cmGeneratorExpressionContext: Fix include order
    
    We need to include a CMake header before a standard header to
    get LFS mangling right on AIX.

diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h
index c02994f..ed83509 100644
--- a/Source/cmGeneratorExpressionContext.h
+++ b/Source/cmGeneratorExpressionContext.h
@@ -12,12 +12,12 @@
 #ifndef cmGeneratorExpressionContext_h
 #define cmGeneratorExpressionContext_h
 
+#include "cmListFileCache.h"
+
 #include <set>
 #include <map>
 #include <string>
 
-#include "cmListFileCache.h"
-
 class cmTarget;
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmGeneratorExpressionContext.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list