From ae6a5ea5a2119841b4a11b03f879ac426edbbdf8 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 7 Aug 2013 10:14:58 -0400
Subject: [PATCH] Include cmMakefile.h before cm*Lexer.h to get stdint.h first

Some generated cm*Lexer.h headers define preprocessor macros normally
provided by <stdint.h>.  The latter is included indrectly by cmMakefile.h
since commit 2268c41a (Optimize custom command full-path dependency
lookup, 2013-08-06).  Adjust the order to avoid redefinition warnings.
---
 Source/cmCommandArgumentParserHelper.cxx | 4 ++--
 Source/cmExprParserHelper.cxx            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx
index 2f26b0cd44..dbeeb07938 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -12,10 +12,10 @@
 #include "cmCommandArgumentParserHelper.h"
 
 #include "cmSystemTools.h"
-#include "cmCommandArgumentLexer.h"
-
 #include "cmMakefile.h"
 
+#include "cmCommandArgumentLexer.h"
+
 int cmCommandArgument_yyparse( yyscan_t yyscanner );
 //
 cmCommandArgumentParserHelper::cmCommandArgumentParserHelper()
diff --git a/Source/cmExprParserHelper.cxx b/Source/cmExprParserHelper.cxx
index 9c1795ec25..cc35f84cd6 100644
--- a/Source/cmExprParserHelper.cxx
+++ b/Source/cmExprParserHelper.cxx
@@ -12,10 +12,10 @@
 #include "cmExprParserHelper.h"
 
 #include "cmSystemTools.h"
-#include "cmExprLexer.h"
-
 #include "cmMakefile.h"
 
+#include "cmExprLexer.h"
+
 int cmExpr_yyparse( yyscan_t yyscanner );
 //
 cmExprParserHelper::cmExprParserHelper()