diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmComputeLinkDepends.cxx | 10 | ||||
| -rw-r--r-- | Source/cmExportFileGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmStandardIncludes.h | 1 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 18 |
4 files changed, 18 insertions, 17 deletions
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index 391b991..ecbb129 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -308,14 +308,14 @@ void cmComputeLinkDepends::FollowLinkEntry(BFSEntry const& qe) if(entry.Target) { // Follow the target dependencies. - if(cmTargetLinkInterface const* interface = + if(cmTargetLinkInterface const* iface = entry.Target->GetLinkInterface(this->Config)) { // This target provides its own link interface information. - this->AddLinkEntries(depender_index, interface->Libraries); + this->AddLinkEntries(depender_index, iface->Libraries); // Handle dependent shared libraries. - this->QueueSharedDependencies(depender_index, interface->SharedDeps); + this->QueueSharedDependencies(depender_index, iface->SharedDeps); } else if(!entry.Target->IsImported() && entry.Target->GetType() != cmTarget::EXECUTABLE) @@ -381,11 +381,11 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep) // Target items may have their own dependencies. if(entry.Target) { - if(cmTargetLinkInterface const* interface = + if(cmTargetLinkInterface const* iface = entry.Target->GetLinkInterface(this->Config)) { // We use just the shared dependencies, not the interface. - this->QueueSharedDependencies(index, interface->SharedDeps); + this->QueueSharedDependencies(index, iface->SharedDeps); } } } diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 04946cf..f28f841 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -135,16 +135,16 @@ cmExportFileGenerator } // Add the transitive link dependencies for this configuration. - if(cmTargetLinkInterface const* interface = + if(cmTargetLinkInterface const* iface = target->GetLinkInterface(config)) { // This target provides a link interface, so use it. this->SetImportLinkProperty(suffix, target, "IMPORTED_LINK_INTERFACE_LIBRARIES", - interface->Libraries, properties); + iface->Libraries, properties); this->SetImportLinkProperty(suffix, target, "IMPORTED_LINK_DEPENDENT_LIBRARIES", - interface->SharedDeps, properties); + iface->SharedDeps, properties); } else if(target->GetType() == cmTarget::STATIC_LIBRARY || target->GetType() == cmTarget::SHARED_LIBRARY) diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index 5b0ccfb..390cb16 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -83,6 +83,7 @@ public: // support the large integer types. #if defined(CMAKE_BUILD_WITH_CMAKE) # include <cmsys/IOStream.hxx> +# undef GetCurrentDirectory // Borland <iosfwd> includes windows.h #endif // Avoid warnings in system headers. diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 3da4627..b4c36c6 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -3282,11 +3282,11 @@ cmTargetLinkInterface const* cmTarget::GetLinkInterface(const char* config) if(i == this->LinkInterface.end()) { // Compute the link interface for this configuration. - cmTargetLinkInterface* interface = this->ComputeLinkInterface(config); + cmTargetLinkInterface* iface = this->ComputeLinkInterface(config); // Store the information for this configuration. std::map<cmStdString, cmTargetLinkInterface*>::value_type - entry(config?config:"", interface); + entry(config?config:"", iface); i = this->LinkInterface.insert(entry).first; } @@ -3329,14 +3329,14 @@ cmTargetLinkInterface* cmTarget::ComputeLinkInterface(const char* config) } // Allocate the interface. - cmTargetLinkInterface* interface = new cmTargetLinkInterface; - if(!interface) + cmTargetLinkInterface* iface = new cmTargetLinkInterface; + if(!iface) { return 0; } // Expand the list of libraries in the interface. - cmSystemTools::ExpandListArgument(libs, interface->Libraries); + cmSystemTools::ExpandListArgument(libs, iface->Libraries); // Now we need to construct a list of shared library dependencies // not included in the interface. @@ -3346,8 +3346,8 @@ cmTargetLinkInterface* cmTarget::ComputeLinkInterface(const char* config) // either list. std::set<cmStdString> emitted; for(std::vector<std::string>::const_iterator - li = interface->Libraries.begin(); - li != interface->Libraries.end(); ++li) + li = iface->Libraries.begin(); + li != iface->Libraries.end(); ++li) { emitted.insert(*li); } @@ -3384,7 +3384,7 @@ cmTargetLinkInterface* cmTarget::ComputeLinkInterface(const char* config) { if(tgt->GetType() == cmTarget::SHARED_LIBRARY) { - interface->SharedDeps.push_back(li->first); + iface->SharedDeps.push_back(li->first); } } else @@ -3398,7 +3398,7 @@ cmTargetLinkInterface* cmTarget::ComputeLinkInterface(const char* config) } // Return the completed interface. - return interface; + return iface; } //---------------------------------------------------------------------------- |