diff options
author | Brad King <brad.king@kitware.com> | 2008-02-24 19:05:11 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2008-02-24 19:05:11 (GMT) |
commit | dab5ea859aa93acecc075d18a8ca1775090b5c75 (patch) | |
tree | 7302d7e00083f591ac8e33313c80c8d61fca5935 /Source/cmComputeLinkDepends.cxx | |
parent | daaaf7fdcc6bd947a9d69069241476bf0335b154 (diff) | |
download | CMake-dab5ea859aa93acecc075d18a8ca1775090b5c75.zip CMake-dab5ea859aa93acecc075d18a8ca1775090b5c75.tar.gz CMake-dab5ea859aa93acecc075d18a8ca1775090b5c75.tar.bz2 |
COMP: Fix Borland 5.5 build
- Its <iosfwd> header includes windows.h which
defines GetCurrentDirectory
- It defines 'interface' so we cannot use it as
a variable name.
Diffstat (limited to 'Source/cmComputeLinkDepends.cxx')
-rw-r--r-- | Source/cmComputeLinkDepends.cxx | 10 |
1 files changed, 5 insertions, 5 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); } } } |