Remove some obsolete declarations

Ensure that cmStandardIncludes.h is included before any platform header
in cmGeneratorExpressionEvaluator.h.  That file needs to change as
a result of removal of the cmMakefile.h header from
cmGeneratorExpressionNode.h, affecting the compilation of
cmGeneratorExpressionNode.cxx.

On AIX we need to include our own headers first to get large file
support macros defined consistently within system headers.  The old
order in this header worked only because it was always included after
other headers.
This commit is contained in:
Stephen Kelly 2015-10-10 18:27:44 +02:00
parent ce43ed2cc1
commit b22e5d0ab7
13 changed files with 3 additions and 19 deletions

View File

@ -13,7 +13,6 @@
#define cmComputeLinkDepends_h #define cmComputeLinkDepends_h
#include "cmStandardIncludes.h" #include "cmStandardIncludes.h"
#include "cmTarget.h"
#include "cmLinkItem.h" #include "cmLinkItem.h"
#include "cmGraphAdjacencyList.h" #include "cmGraphAdjacencyList.h"

View File

@ -17,7 +17,6 @@
#include "cmake.h" #include "cmake.h"
#include "cmSourceFile.h" #include "cmSourceFile.h"
#include "cmGeneratedFileStream.h" #include "cmGeneratedFileStream.h"
#include "cmTarget.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include <cmsys/SystemTools.hxx> #include <cmsys/SystemTools.hxx>

View File

@ -16,8 +16,6 @@
#include "cmExternalMakefileProjectGenerator.h" #include "cmExternalMakefileProjectGenerator.h"
class cmLocalGenerator; class cmLocalGenerator;
class cmMakefile;
class cmTarget;
class cmGeneratedFileStream; class cmGeneratedFileStream;
/** \class cmExtraKateGenerator /** \class cmExtraKateGenerator

View File

@ -12,7 +12,6 @@
#include "cmGeneratorExpressionDAGChecker.h" #include "cmGeneratorExpressionDAGChecker.h"
#include "cmMakefile.h"
#include "cmLocalGenerator.h" #include "cmLocalGenerator.h"
#include "cmAlgorithms.h" #include "cmAlgorithms.h"

View File

@ -12,13 +12,11 @@
#ifndef cmGeneratorExpressionEvaluator_h #ifndef cmGeneratorExpressionEvaluator_h
#define cmGeneratorExpressionEvaluator_h #define cmGeneratorExpressionEvaluator_h
#include <vector>
#include <string>
#include "cmListFileCache.h" #include "cmListFileCache.h"
#include "cmGeneratorExpressionContext.h" #include "cmGeneratorExpressionContext.h"
class cmTarget; #include <vector>
#include <string>
struct cmGeneratorExpressionDAGChecker; struct cmGeneratorExpressionDAGChecker;
struct cmGeneratorExpressionNode; struct cmGeneratorExpressionNode;

View File

@ -14,6 +14,7 @@
#include "cmGlobalGenerator.h" #include "cmGlobalGenerator.h"
#include "cmAlgorithms.h" #include "cmAlgorithms.h"
#include "cmOutputConverter.h" #include "cmOutputConverter.h"
#include "cmMakefile.h"
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string cmGeneratorExpressionNode::EvaluateDependentExpression( std::string cmGeneratorExpressionNode::EvaluateDependentExpression(

View File

@ -12,8 +12,6 @@
#ifndef cmGeneratorExpressionNode_h #ifndef cmGeneratorExpressionNode_h
#define cmGeneratorExpressionNode_h #define cmGeneratorExpressionNode_h
#include "cmMakefile.h"
#include "cmGeneratorExpressionEvaluator.h" #include "cmGeneratorExpressionEvaluator.h"
#include "cmGeneratorExpressionParser.h" #include "cmGeneratorExpressionParser.h"
#include "cmGeneratorExpressionDAGChecker.h" #include "cmGeneratorExpressionDAGChecker.h"

View File

@ -19,8 +19,6 @@
#include "cmListFileCache.h" #include "cmListFileCache.h"
class cmMakefile;
class cmTarget;
struct cmGeneratorExpressionEvaluator; struct cmGeneratorExpressionEvaluator;
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

View File

@ -15,7 +15,6 @@
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmake.h" #include "cmake.h"
#include "cmGeneratedFileStream.h" #include "cmGeneratedFileStream.h"
#include "cmSourceFile.h"
#include "cmGeneratorTarget.h" #include "cmGeneratorTarget.h"
#include "cmAlgorithms.h" #include "cmAlgorithms.h"

View File

@ -11,7 +11,6 @@
============================================================================*/ ============================================================================*/
#include "cmInstallDirectoryGenerator.h" #include "cmInstallDirectoryGenerator.h"
#include "cmTarget.h"
#include "cmGeneratorExpression.h" #include "cmGeneratorExpression.h"
#include "cmLocalGenerator.h" #include "cmLocalGenerator.h"

View File

@ -10,7 +10,6 @@
See the License for more information. See the License for more information.
============================================================================*/ ============================================================================*/
#include "cmLocalVisualStudio10Generator.h" #include "cmLocalVisualStudio10Generator.h"
#include "cmTarget.h"
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmVisualStudio10TargetGenerator.h" #include "cmVisualStudio10TargetGenerator.h"
#include "cmGlobalVisualStudio10Generator.h" #include "cmGlobalVisualStudio10Generator.h"

View File

@ -30,7 +30,6 @@ class cmake;
class cmMakefile; class cmMakefile;
class cmSourceFile; class cmSourceFile;
class cmGlobalGenerator; class cmGlobalGenerator;
class cmComputeLinkInformation;
class cmListFileBacktrace; class cmListFileBacktrace;
class cmTarget; class cmTarget;
class cmGeneratorTarget; class cmGeneratorTarget;

View File

@ -13,10 +13,8 @@
#include "cmGeneratorExpression.h" #include "cmGeneratorExpression.h"
#include "cmOutputConverter.h" #include "cmOutputConverter.h"
#include "cmMakefile.h"
#include "cmLocalGenerator.h" #include "cmLocalGenerator.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmTarget.h"
#include "cmTest.h" #include "cmTest.h"
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------