summaryrefslogtreecommitdiffstats
path: root/Source/cmDSWWriter.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2001-02-28 22:50:15 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2001-02-28 22:50:15 (GMT)
commitaf30fe67458fd26054696ce018f7ae6faaebcca4 (patch)
treef85d75d8c8f1f4973f200075545584f81d2f04ab /Source/cmDSWWriter.cxx
parentd0a8794746f6de026f1c69652cd09caf8be9cfab (diff)
downloadCMake-af30fe67458fd26054696ce018f7ae6faaebcca4.zip
CMake-af30fe67458fd26054696ce018f7ae6faaebcca4.tar.gz
CMake-af30fe67458fd26054696ce018f7ae6faaebcca4.tar.bz2
BUG: fix circular depends on libraries and remove depends for static libraries
Diffstat (limited to 'Source/cmDSWWriter.cxx')
-rw-r--r--Source/cmDSWWriter.cxx15
1 files changed, 9 insertions, 6 deletions
diff --git a/Source/cmDSWWriter.cxx b/Source/cmDSWWriter.cxx
index 19fe27f..6534570 100644
--- a/Source/cmDSWWriter.cxx
+++ b/Source/cmDSWWriter.cxx
@@ -18,7 +18,7 @@
#include "cmSystemTools.h"
#include "cmDSPMakefile.h"
#include "cmMSProjectGenerator.h"
-#include <windows.h>
+//#include <windows.h>
cmDSWMakefile::cmDSWMakefile(cmMakefile* m)
@@ -126,13 +126,16 @@ void cmDSWMakefile::WriteProject(std::ostream& fout,
std::vector<std::string>::iterator i, end;
i = project->GetMakefile()->GetLinkLibraries().begin();
end = project->GetMakefile()->GetLinkLibraries().end();
- for(;i!= end; ++i)
+ if(project->GetBuildType() != cmDSPMakefile::STATIC_LIBRARY)
{
- if (strcmp(i->c_str(),dspname))
+ for(;i!= end; ++i)
{
- fout << "Begin Project Dependency\n";
- fout << "Project_Dep_Name " << *i << "\n";
- fout << "End Project Dependency\n";
+ if (strcmp(i->c_str(),dspname))
+ {
+ fout << "Begin Project Dependency\n";
+ fout << "Project_Dep_Name " << *i << "\n";
+ fout << "End Project Dependency\n";
+ }
}
}
fout << "}}}\n\n";