diff options
Diffstat (limited to 'Source/cmComputeLinkInformation.h')
-rw-r--r-- | Source/cmComputeLinkInformation.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h index 4ca3afa..2bbe05d 100644 --- a/Source/cmComputeLinkInformation.h +++ b/Source/cmComputeLinkInformation.h @@ -58,7 +58,7 @@ public: std::string GetChrpathTool(); std::set<cmTarget*> const& GetSharedLibrariesLinked(); private: - void AddItem(std::string const& item, cmTarget* tgt); + void AddItem(std::string const& item, cmTarget* tgt, bool isSharedDep); // Output information. ItemVector Items; @@ -78,6 +78,14 @@ private: const char* Config; const char* LinkLanguage; + // Modes for dealing with dependent shared libraries. + enum SharedDepMode + { + SharedDepModeNone, // Drop + SharedDepModeDir, // Use in runtime information + SharedDepModeLink // List file on link line + }; + // System info. bool UseImportLibrary; const char* LoaderFlag; @@ -88,6 +96,7 @@ private: std::string RuntimeSep; std::string RuntimeAlways; bool RuntimeUseChrpath; + SharedDepMode SharedDependencyMode; // Link type adjustment. void ComputeLinkTypeInfo(); @@ -134,6 +143,7 @@ private: void AddLinkerSearchDirectories(std::vector<std::string> const& dirs); std::set<cmStdString> DirectoriesEmmitted; std::set<cmStdString> ImplicitLinkDirs; + std::vector<std::string> SharedDependencyDirectories; // Linker search path compatibility mode. std::vector<std::string> OldLinkDirs; |