Browse Source

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.
pull/198/head
Stephen Kelly 10 years ago
parent
commit
b22e5d0ab7
  1. 1
      Source/cmComputeLinkDepends.h
  2. 1
      Source/cmExtraKateGenerator.cxx
  3. 2
      Source/cmExtraKateGenerator.h
  4. 1
      Source/cmGeneratorExpressionDAGChecker.cxx
  5. 6
      Source/cmGeneratorExpressionEvaluator.h
  6. 1
      Source/cmGeneratorExpressionNode.cxx
  7. 2
      Source/cmGeneratorExpressionNode.h
  8. 2
      Source/cmGeneratorExpressionParser.h
  9. 1
      Source/cmGlobalUnixMakefileGenerator3.cxx
  10. 1
      Source/cmInstallDirectoryGenerator.cxx
  11. 1
      Source/cmLocalVisualStudio10Generator.cxx
  12. 1
      Source/cmTarget.h
  13. 2
      Source/cmTestGenerator.cxx

1
Source/cmComputeLinkDepends.h

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

1
Source/cmExtraKateGenerator.cxx

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

2
Source/cmExtraKateGenerator.h

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

1
Source/cmGeneratorExpressionDAGChecker.cxx

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

6
Source/cmGeneratorExpressionEvaluator.h

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

1
Source/cmGeneratorExpressionNode.cxx

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

2
Source/cmGeneratorExpressionNode.h

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

2
Source/cmGeneratorExpressionParser.h

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

1
Source/cmGlobalUnixMakefileGenerator3.cxx

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

1
Source/cmInstallDirectoryGenerator.cxx

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

1
Source/cmLocalVisualStudio10Generator.cxx

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

1
Source/cmTarget.h

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

2
Source/cmTestGenerator.cxx

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

Loading…
Cancel
Save