Browse Source

ENH: only add .lib if no .lib exists

Bill Hoffman 24 years ago
parent
commit
e30a660df5
2 changed files with 24 additions and 6 deletions
  1. 12 3
      Source/cmDSPMakefile.cxx
  2. 12 3
      Source/cmDSPWriter.cxx

+ 12 - 3
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 ";
+          }
         }      
       }
     }

+ 12 - 3
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 ";
+          }
         }      
       }
     }