diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-02-20 19:37:24 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-02-20 19:37:24 (GMT) |
commit | 398827ebc1689f70e1e4a32a61d8d663cbbe3606 (patch) | |
tree | 50d9156e0dbf1b78f896bd88eb70301101300dd7 /Source/cmLocalGenerator.h | |
parent | 7bdec941542ab7cf93a7d6417ff2e5528d6b1b87 (diff) | |
download | CMake-398827ebc1689f70e1e4a32a61d8d663cbbe3606.zip CMake-398827ebc1689f70e1e4a32a61d8d663cbbe3606.tar.gz CMake-398827ebc1689f70e1e4a32a61d8d663cbbe3606.tar.bz2 |
ENH: make it compile on vs6
Diffstat (limited to 'Source/cmLocalGenerator.h')
-rw-r--r-- | Source/cmLocalGenerator.h | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index b94cbcc..aca74ea 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -165,21 +165,6 @@ public: /** Get the include flags for the current makefile and language. */ void GetIncludeDirectories(std::vector<std::string>& dirs); -protected: - /** Construct a script from the given list of command lines. */ - std::string ConstructScript(const cmCustomCommandLines& commandLines, - const char* workingDirectory, - const char* newline = "\n"); - - ///! Fill out these strings for the given target. Libraries to link, flags, and linkflags. - void GetTargetFlags(std::string& linkLibs, - std::string& flags, - std::string& linkFlags, - cmTarget&target); - - ///! put all the libraries for a target on into the given stream - virtual void OutputLinkLibraries(std::ostream&, cmTarget&, bool relink); - // Create a struct to hold the varibles passed into // ExpandRuleVariables struct RuleVariables @@ -208,8 +193,22 @@ protected: const char* TargetSOName; const char* LinkFlags; }; - - + +protected: + /** Construct a script from the given list of command lines. */ + std::string ConstructScript(const cmCustomCommandLines& commandLines, + const char* workingDirectory, + const char* newline = "\n"); + + ///! Fill out these strings for the given target. Libraries to link, flags, and linkflags. + void GetTargetFlags(std::string& linkLibs, + std::string& flags, + std::string& linkFlags, + cmTarget&target); + + ///! put all the libraries for a target on into the given stream + virtual void OutputLinkLibraries(std::ostream&, cmTarget&, bool relink); + // Expand rule variables in CMake of the type found in language rules void ExpandRuleVariables(std::string& string, const RuleVariables& replaceValues); |