|
@@ -82,7 +82,6 @@ private:
|
|
|
// Configuration information.
|
|
// Configuration information.
|
|
|
std::string Config;
|
|
std::string Config;
|
|
|
std::string LinkLanguage;
|
|
std::string LinkLanguage;
|
|
|
- bool LinkDependsNoShared;
|
|
|
|
|
|
|
|
|
|
// Modes for dealing with dependent shared libraries.
|
|
// Modes for dealing with dependent shared libraries.
|
|
|
enum SharedDepMode
|
|
enum SharedDepMode
|
|
@@ -93,8 +92,6 @@ private:
|
|
|
SharedDepModeLink // List file on link line
|
|
SharedDepModeLink // List file on link line
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- // System info.
|
|
|
|
|
- bool UseImportLibrary;
|
|
|
|
|
const char* LoaderFlag;
|
|
const char* LoaderFlag;
|
|
|
std::string LibLinkFlag;
|
|
std::string LibLinkFlag;
|
|
|
std::string LibLinkFileFlag;
|
|
std::string LibLinkFileFlag;
|
|
@@ -102,22 +99,18 @@ private:
|
|
|
std::string RuntimeFlag;
|
|
std::string RuntimeFlag;
|
|
|
std::string RuntimeSep;
|
|
std::string RuntimeSep;
|
|
|
std::string RuntimeAlways;
|
|
std::string RuntimeAlways;
|
|
|
- bool RuntimeUseChrpath;
|
|
|
|
|
- bool NoSONameUsesPath;
|
|
|
|
|
- bool LinkWithRuntimePath;
|
|
|
|
|
std::string RPathLinkFlag;
|
|
std::string RPathLinkFlag;
|
|
|
SharedDepMode SharedDependencyMode;
|
|
SharedDepMode SharedDependencyMode;
|
|
|
|
|
|
|
|
|
|
+ enum LinkType { LinkUnknown, LinkStatic, LinkShared };
|
|
|
|
|
+ void SetCurrentLinkType(LinkType lt);
|
|
|
|
|
+
|
|
|
// Link type adjustment.
|
|
// Link type adjustment.
|
|
|
void ComputeLinkTypeInfo();
|
|
void ComputeLinkTypeInfo();
|
|
|
- enum LinkType { LinkUnknown, LinkStatic, LinkShared };
|
|
|
|
|
LinkType StartLinkType;
|
|
LinkType StartLinkType;
|
|
|
LinkType CurrentLinkType;
|
|
LinkType CurrentLinkType;
|
|
|
std::string StaticLinkTypeFlag;
|
|
std::string StaticLinkTypeFlag;
|
|
|
std::string SharedLinkTypeFlag;
|
|
std::string SharedLinkTypeFlag;
|
|
|
- bool LinkTypeEnabled;
|
|
|
|
|
- void SetCurrentLinkType(LinkType lt);
|
|
|
|
|
- bool ArchivesMayBeShared;
|
|
|
|
|
|
|
|
|
|
// Link item parsing.
|
|
// Link item parsing.
|
|
|
void ComputeItemParserInfo();
|
|
void ComputeItemParserInfo();
|
|
@@ -129,7 +122,6 @@ private:
|
|
|
cmsys::RegularExpression ExtractSharedLibraryName;
|
|
cmsys::RegularExpression ExtractSharedLibraryName;
|
|
|
cmsys::RegularExpression ExtractAnyLibraryName;
|
|
cmsys::RegularExpression ExtractAnyLibraryName;
|
|
|
std::string SharedRegexString;
|
|
std::string SharedRegexString;
|
|
|
- bool OpenBSD;
|
|
|
|
|
void AddLinkPrefix(const char* p);
|
|
void AddLinkPrefix(const char* p);
|
|
|
void AddLinkExtension(const char* e, LinkType type);
|
|
void AddLinkExtension(const char* e, LinkType type);
|
|
|
std::string CreateExtensionRegex(std::vector<std::string> const& exts,
|
|
std::string CreateExtensionRegex(std::vector<std::string> const& exts,
|
|
@@ -173,20 +165,27 @@ private:
|
|
|
std::set<std::string> OldLinkDirMask;
|
|
std::set<std::string> OldLinkDirMask;
|
|
|
std::vector<std::string> OldLinkDirItems;
|
|
std::vector<std::string> OldLinkDirItems;
|
|
|
std::vector<std::string> OldUserFlagItems;
|
|
std::vector<std::string> OldUserFlagItems;
|
|
|
- bool OldLinkDirMode;
|
|
|
|
|
-
|
|
|
|
|
- // CMP0060 warnings.
|
|
|
|
|
- bool CMP0060Warn;
|
|
|
|
|
std::set<std::string> CMP0060WarnItems;
|
|
std::set<std::string> CMP0060WarnItems;
|
|
|
-
|
|
|
|
|
|
|
+ // Dependent library path computation.
|
|
|
|
|
+ cmOrderDirectories* OrderDependentRPath;
|
|
|
// Runtime path computation.
|
|
// Runtime path computation.
|
|
|
cmOrderDirectories* OrderRuntimeSearchPath;
|
|
cmOrderDirectories* OrderRuntimeSearchPath;
|
|
|
|
|
+
|
|
|
|
|
+ bool OldLinkDirMode;
|
|
|
|
|
+ bool OpenBSD;
|
|
|
|
|
+ bool LinkDependsNoShared;
|
|
|
|
|
+ bool UseImportLibrary;
|
|
|
|
|
+ bool RuntimeUseChrpath;
|
|
|
|
|
+ bool NoSONameUsesPath;
|
|
|
|
|
+ bool LinkWithRuntimePath;
|
|
|
|
|
+ bool LinkTypeEnabled;
|
|
|
|
|
+ bool ArchivesMayBeShared;
|
|
|
|
|
+ bool CMP0060Warn;
|
|
|
|
|
+
|
|
|
void AddLibraryRuntimeInfo(std::string const& fullPath,
|
|
void AddLibraryRuntimeInfo(std::string const& fullPath,
|
|
|
cmTarget const* target);
|
|
cmTarget const* target);
|
|
|
void AddLibraryRuntimeInfo(std::string const& fullPath);
|
|
void AddLibraryRuntimeInfo(std::string const& fullPath);
|
|
|
|
|
|
|
|
- // Dependent library path computation.
|
|
|
|
|
- cmOrderDirectories* OrderDependentRPath;
|
|
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
#endif
|
|
#endif
|