diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-05-09 19:48:06 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-05-09 19:48:06 (GMT) |
| commit | e30a660df5a8ab3335ada8896f22e7ec2fc759e4 (patch) | |
| tree | 6305190126494a79c0caefd35bab3d762b954360 /Source | |
| parent | f07ee5b8177e9e08f290e3acdff6c31d6b694bf6 (diff) | |
| download | CMake-e30a660df5a8ab3335ada8896f22e7ec2fc759e4.zip CMake-e30a660df5a8ab3335ada8896f22e7ec2fc759e4.tar.gz CMake-e30a660df5a8ab3335ada8896f22e7ec2fc759e4.tar.bz2 | |
ENH: only add .lib if no .lib exists
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmDSPMakefile.cxx | 15 | ||||
| -rw-r--r-- | 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 "; + } } } } |