From e30a660df5a8ab3335ada8896f22e7ec2fc759e4 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Wed, 9 May 2001 15:48:06 -0400
Subject: ENH: only add .lib if no .lib exists

---
 Source/cmDSPMakefile.cxx | 15 ++++++++++++---
 Source/cmDSPWriter.cxx   | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/Source/cmDSPMakefile.cxx b/Source/cmDSPMakefile.cxx
index 3c2969c..c54d1a3 100644
--- a/Source/cmDSPMakefile.cxx
+++ b/Source/cmDSPMakefile.cxx
@@ -443,19 +443,28 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName,
         {
         libOptions += " ";
         libOptions += j->first;
-        libOptions += ".lib ";
+        if(j->first.find(".lib") == std::string::npos)
+          {
+          libOptions += ".lib ";
+          }
         }
       if (j->second == cmTarget::DEBUG)
         {
         libDebugOptions += " ";
         libDebugOptions += j->first;
-        libDebugOptions += ".lib ";
+        if(j->first.find(".lib") == std::string::npos)
+          {
+          libDebugOptions += ".lib ";
+          }
         }
       if (j->second == cmTarget::OPTIMIZED)
         {
         libOptimizedOptions += " ";
         libOptimizedOptions += j->first;
-        libOptimizedOptions += ".lib ";
+        if(j->first.find(".lib") == std::string::npos)
+          {
+          libOptimizedOptions += ".lib ";
+          }
         }      
       }
     }
diff --git a/Source/cmDSPWriter.cxx b/Source/cmDSPWriter.cxx
index 3c2969c..c54d1a3 100644
--- a/Source/cmDSPWriter.cxx
+++ b/Source/cmDSPWriter.cxx
@@ -443,19 +443,28 @@ void cmDSPMakefile::WriteDSPHeader(std::ostream& fout, const char *libName,
         {
         libOptions += " ";
         libOptions += j->first;
-        libOptions += ".lib ";
+        if(j->first.find(".lib") == std::string::npos)
+          {
+          libOptions += ".lib ";
+          }
         }
       if (j->second == cmTarget::DEBUG)
         {
         libDebugOptions += " ";
         libDebugOptions += j->first;
-        libDebugOptions += ".lib ";
+        if(j->first.find(".lib") == std::string::npos)
+          {
+          libDebugOptions += ".lib ";
+          }
         }
       if (j->second == cmTarget::OPTIMIZED)
         {
         libOptimizedOptions += " ";
         libOptimizedOptions += j->first;
-        libOptimizedOptions += ".lib ";
+        if(j->first.find(".lib") == std::string::npos)
+          {
+          libOptimizedOptions += ".lib ";
+          }
         }      
       }
     }
-- 
cgit v0.12