diff options
author | Brad King <brad.king@kitware.com> | 2014-07-14 18:39:20 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-07-14 18:39:20 (GMT) |
commit | 8a205b980c8dc088aa2c9f91adb90d57a65fa560 (patch) | |
tree | 5b631a4434a072c0939ddbf85c8f2444ffb8888b /Source/cmTarget.h | |
parent | d57be904ae997e44ec9ac3b44722277f81936577 (diff) | |
download | CMake-8a205b980c8dc088aa2c9f91adb90d57a65fa560.zip CMake-8a205b980c8dc088aa2c9f91adb90d57a65fa560.tar.gz CMake-8a205b980c8dc088aa2c9f91adb90d57a65fa560.tar.bz2 |
cmTarget: Compile old-style link dependencies only for VS 6
Compile all the "ForVS6" cmTarget members only on Windows. No other
platforms support the VS 6 generator.
Diffstat (limited to 'Source/cmTarget.h')
-rw-r--r-- | Source/cmTarget.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Source/cmTarget.h b/Source/cmTarget.h index bd5417a..c2efb14 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -179,8 +179,6 @@ public: typedef std::pair<std::string, LinkLibraryType> LibraryID; typedef std::vector<LibraryID > LinkLibraryVectorType; - const LinkLibraryVectorType &GetLinkLibrariesForVS6() const { - return this->LinkLibrariesForVS6;} const LinkLibraryVectorType &GetOriginalLinkLibraries() const {return this->OriginalLinkLibraries;} @@ -613,6 +611,11 @@ public: return this->MaxLanguageStandards; } +#if defined(_WIN32) && !defined(__CYGWIN__) + const LinkLibraryVectorType &GetLinkLibrariesForVS6() const { + return this->LinkLibrariesForVS6;} +#endif + private: bool HandleLocationPropertyPolicy(cmMakefile* context) const; @@ -622,6 +625,7 @@ private: std::vector<std::pair<TLLSignature, cmListFileBacktrace> > TLLCommands; +#if defined(_WIN32) && !defined(__CYGWIN__) /** * A list of direct dependencies. Use in conjunction with DependencyMap. */ @@ -672,6 +676,7 @@ private: DependencyMap& dep_map); void AnalyzeLibDependenciesForVS6( const cmMakefile& mf ); +#endif const char* GetSuffixVariableInternal(bool implib) const; const char* GetPrefixVariableInternal(bool implib) const; @@ -720,9 +725,11 @@ private: std::vector<cmCustomCommand> PreLinkCommands; std::vector<cmCustomCommand> PostBuildCommands; TargetType TargetTypeValue; - LinkLibraryVectorType LinkLibrariesForVS6; LinkLibraryVectorType PrevLinkedLibraries; +#if defined(_WIN32) && !defined(__CYGWIN__) + LinkLibraryVectorType LinkLibrariesForVS6; bool LinkLibrariesForVS6Analyzed; +#endif std::vector<std::string> LinkDirectories; std::set<std::string> LinkDirectoriesEmmitted; bool HaveInstallRule; |