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/cmTarget.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/cmTarget.cxx')
-rw-r--r-- | Source/cmTarget.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
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; } //---------------------------------------------------------------------------- |