mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-17 12:11:36 -06:00
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.
This commit is contained in:
@@ -12,10 +12,10 @@
|
|||||||
#include "cmCommandArgumentParserHelper.h"
|
#include "cmCommandArgumentParserHelper.h"
|
||||||
|
|
||||||
#include "cmSystemTools.h"
|
#include "cmSystemTools.h"
|
||||||
#include "cmCommandArgumentLexer.h"
|
|
||||||
|
|
||||||
#include "cmMakefile.h"
|
#include "cmMakefile.h"
|
||||||
|
|
||||||
|
#include "cmCommandArgumentLexer.h"
|
||||||
|
|
||||||
int cmCommandArgument_yyparse( yyscan_t yyscanner );
|
int cmCommandArgument_yyparse( yyscan_t yyscanner );
|
||||||
//
|
//
|
||||||
cmCommandArgumentParserHelper::cmCommandArgumentParserHelper()
|
cmCommandArgumentParserHelper::cmCommandArgumentParserHelper()
|
||||||
|
|||||||
@@ -12,10 +12,10 @@
|
|||||||
#include "cmExprParserHelper.h"
|
#include "cmExprParserHelper.h"
|
||||||
|
|
||||||
#include "cmSystemTools.h"
|
#include "cmSystemTools.h"
|
||||||
#include "cmExprLexer.h"
|
|
||||||
|
|
||||||
#include "cmMakefile.h"
|
#include "cmMakefile.h"
|
||||||
|
|
||||||
|
#include "cmExprLexer.h"
|
||||||
|
|
||||||
int cmExpr_yyparse( yyscan_t yyscanner );
|
int cmExpr_yyparse( yyscan_t yyscanner );
|
||||||
//
|
//
|
||||||
cmExprParserHelper::cmExprParserHelper()
|
cmExprParserHelper::cmExprParserHelper()
|
||||||
|
|||||||
Reference in New Issue
Block a user