diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-22 22:49:58 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-26 21:02:13 (GMT) |
| commit | bde277e811fea2532ed32ade6d7f3d6e910bfda0 (patch) | |
| tree | 735e8e47def68138ce3937784fd31c3a05e94870 | |
| parent | cf69630e510a5c639a93a99b315fcefea9688935 (diff) | |
| download | CMake-bde277e811fea2532ed32ade6d7f3d6e910bfda0.zip CMake-bde277e811fea2532ed32ade6d7f3d6e910bfda0.tar.gz CMake-bde277e811fea2532ed32ade6d7f3d6e910bfda0.tar.bz2 | |
cmGeneratorTarget: Add GetLinkDirectories API.
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 6 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 5 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.h | 2 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index a32bb48..50d8324 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -377,9 +377,9 @@ cmComputeLinkInformation // Add the search path entries requested by the user to path ordering. this->OrderLinkerSearchPath - ->AddUserDirectories(this->Target->Target->GetLinkDirectories()); + ->AddUserDirectories(this->Target->GetLinkDirectories()); this->OrderRuntimeSearchPath - ->AddUserDirectories(this->Target->Target->GetLinkDirectories()); + ->AddUserDirectories(this->Target->GetLinkDirectories()); // Set up the implicit link directories. this->LoadImplicitLinkInfo(); @@ -413,7 +413,7 @@ cmComputeLinkInformation // Construct a mask to not bother with this behavior for link // directories already specified by the user. std::vector<std::string> const& dirs = - this->Target->Target->GetLinkDirectories(); + this->Target->GetLinkDirectories(); this->OldLinkDirMask.insert(dirs.begin(), dirs.end()); } diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 95d93bc..7516576 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -1732,6 +1732,11 @@ cmListFileBacktrace cmGeneratorTarget::GetBacktrace() const return this->Target->GetBacktrace(); } +const std::vector<std::string>&cmGeneratorTarget::GetLinkDirectories() const +{ + return this->Target->GetLinkDirectories(); +} + //---------------------------------------------------------------------------- bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const { diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index cc7d585..38e1826 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -184,6 +184,8 @@ public: cmListFileBacktrace GetBacktrace() const; + const std::vector<std::string>& GetLinkDirectories() const; + /** Get the macro to define when building sources in this target. If no macro should be defined null is returned. */ const char* GetExportMacro() const; diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index 3b25eda..fd0af61 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -1052,7 +1052,7 @@ void cmLocalVisualStudio6Generator } std::vector<std::string>::const_iterator i; const std::vector<std::string>& libdirs = - target->Target->GetLinkDirectories(); + target->GetLinkDirectories(); for(i = libdirs.begin(); i != libdirs.end(); ++i) { std::string path = *i; |