|
@@ -179,8 +179,6 @@ public:
|
|
|
typedef std::pair<std::string, LinkLibraryType> LibraryID;
|
|
typedef std::pair<std::string, LinkLibraryType> LibraryID;
|
|
|
|
|
|
|
|
typedef std::vector<LibraryID > LinkLibraryVectorType;
|
|
typedef std::vector<LibraryID > LinkLibraryVectorType;
|
|
|
- const LinkLibraryVectorType &GetLinkLibrariesForVS6() const {
|
|
|
|
|
- return this->LinkLibrariesForVS6;}
|
|
|
|
|
const LinkLibraryVectorType &GetOriginalLinkLibraries() const
|
|
const LinkLibraryVectorType &GetOriginalLinkLibraries() const
|
|
|
{return this->OriginalLinkLibraries;}
|
|
{return this->OriginalLinkLibraries;}
|
|
|
|
|
|
|
@@ -613,6 +611,11 @@ public:
|
|
|
return this->MaxLanguageStandards;
|
|
return this->MaxLanguageStandards;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+#if defined(_WIN32) && !defined(__CYGWIN__)
|
|
|
|
|
+ const LinkLibraryVectorType &GetLinkLibrariesForVS6() const {
|
|
|
|
|
+ return this->LinkLibrariesForVS6;}
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
private:
|
|
private:
|
|
|
bool HandleLocationPropertyPolicy(cmMakefile* context) const;
|
|
bool HandleLocationPropertyPolicy(cmMakefile* context) const;
|
|
|
|
|
|
|
@@ -622,6 +625,7 @@ private:
|
|
|
|
|
|
|
|
std::vector<std::pair<TLLSignature, cmListFileBacktrace> > TLLCommands;
|
|
std::vector<std::pair<TLLSignature, cmListFileBacktrace> > TLLCommands;
|
|
|
|
|
|
|
|
|
|
+#if defined(_WIN32) && !defined(__CYGWIN__)
|
|
|
/**
|
|
/**
|
|
|
* A list of direct dependencies. Use in conjunction with DependencyMap.
|
|
* A list of direct dependencies. Use in conjunction with DependencyMap.
|
|
|
*/
|
|
*/
|
|
@@ -672,6 +676,7 @@ private:
|
|
|
DependencyMap& dep_map);
|
|
DependencyMap& dep_map);
|
|
|
|
|
|
|
|
void AnalyzeLibDependenciesForVS6( const cmMakefile& mf );
|
|
void AnalyzeLibDependenciesForVS6( const cmMakefile& mf );
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
const char* GetSuffixVariableInternal(bool implib) const;
|
|
const char* GetSuffixVariableInternal(bool implib) const;
|
|
|
const char* GetPrefixVariableInternal(bool implib) const;
|
|
const char* GetPrefixVariableInternal(bool implib) const;
|
|
@@ -720,9 +725,11 @@ private:
|
|
|
std::vector<cmCustomCommand> PreLinkCommands;
|
|
std::vector<cmCustomCommand> PreLinkCommands;
|
|
|
std::vector<cmCustomCommand> PostBuildCommands;
|
|
std::vector<cmCustomCommand> PostBuildCommands;
|
|
|
TargetType TargetTypeValue;
|
|
TargetType TargetTypeValue;
|
|
|
- LinkLibraryVectorType LinkLibrariesForVS6;
|
|
|
|
|
LinkLibraryVectorType PrevLinkedLibraries;
|
|
LinkLibraryVectorType PrevLinkedLibraries;
|
|
|
|
|
+#if defined(_WIN32) && !defined(__CYGWIN__)
|
|
|
|
|
+ LinkLibraryVectorType LinkLibrariesForVS6;
|
|
|
bool LinkLibrariesForVS6Analyzed;
|
|
bool LinkLibrariesForVS6Analyzed;
|
|
|
|
|
+#endif
|
|
|
std::vector<std::string> LinkDirectories;
|
|
std::vector<std::string> LinkDirectories;
|
|
|
std::set<std::string> LinkDirectoriesEmmitted;
|
|
std::set<std::string> LinkDirectoriesEmmitted;
|
|
|
bool HaveInstallRule;
|
|
bool HaveInstallRule;
|