[cmake-commits] king committed cmComputeLinkDepends.cxx 1.11 1.12 cmExportFileGenerator.cxx 1.10 1.11 cmStandardIncludes.h 1.71 1.72 cmTarget.cxx 1.199 1.200

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv30897/Source

Modified Files:
	cmComputeLinkDepends.cxx cmExportFileGenerator.cxx 
	cmStandardIncludes.h cmTarget.cxx 
Log Message:
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.


Index: cmComputeLinkDepends.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkDepends.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cmComputeLinkDepends.cxx	13 Feb 2008 20:29:55 -0000	1.11
+++ cmComputeLinkDepends.cxx	24 Feb 2008 19:05:11 -0000	1.12
@@ -308,14 +308,14 @@
   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 @@
   // 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);
       }
     }
 }

Index: cmStandardIncludes.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmStandardIncludes.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- cmStandardIncludes.h	29 Dec 2007 04:07:14 -0000	1.71
+++ cmStandardIncludes.h	24 Feb 2008 19:05:11 -0000	1.72
@@ -83,6 +83,7 @@
 // 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.

Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- cmTarget.cxx	21 Feb 2008 16:41:11 -0000	1.199
+++ cmTarget.cxx	24 Feb 2008 19:05:11 -0000	1.200
@@ -3282,11 +3282,11 @@
   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 @@
     }
 
   // 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 @@
     // 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 @@
         {
         if(tgt->GetType() == cmTarget::SHARED_LIBRARY)
           {
-          interface->SharedDeps.push_back(li->first);
+          iface->SharedDeps.push_back(li->first);
           }
         }
       else
@@ -3398,7 +3398,7 @@
     }
 
   // Return the completed interface.
-  return interface;
+  return iface;
 }
 
 //----------------------------------------------------------------------------

Index: cmExportFileGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExportFileGenerator.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cmExportFileGenerator.cxx	1 Feb 2008 13:56:00 -0000	1.10
+++ cmExportFileGenerator.cxx	24 Feb 2008 19:05:11 -0000	1.11
@@ -135,16 +135,16 @@
     }
 
   // 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)