BUG: fix circular depends on libraries and remove depends for static libraries

6 files changed, 34 insertions, 14 deletions

diff --git a/Source/cmDSPMakefile.cxx b/Source/cmDSPMakefile.cxx
index 87ee5c3..0a1525a 100644
--- a/Source/cmDSPMakefile.cxx
+++ b/Source/cmDSPMakefile.cxx
@@ -261,6 +261,7 @@ void cmDSPMakefile::WriteDSPEndGroup(std::ostream& fout)
 
 void cmDSPMakefile::SetBuildType(BuildType b)
 {
+  m_BuildType = b;
   switch(b)
     {
     case STATIC_LIBRARY:
diff --git a/Source/cmDSPMakefile.h b/Source/cmDSPMakefile.h
index 3ed0a42..08b9428 100644
--- a/Source/cmDSPMakefile.h
+++ b/Source/cmDSPMakefile.h
@@ -39,6 +39,12 @@ public:
    */
   void SetBuildType(BuildType);
 
+  BuildType GetBuildType()
+    {
+      return m_BuildType;
+    }
+  
+
   /**
    * Return array of created DSP names in a STL vector.
    * Each executable must have its own dsp.
@@ -86,7 +92,7 @@ private:
   std::string m_DebugDLLLibraryOptions;
   std::string m_ReleaseDLLLibraryOptions;
   cmMakefile* m_Makefile;
-
+  BuildType m_BuildType;
   std::vector<std::string> m_Configurations;
 };
 
diff --git a/Source/cmDSPWriter.cxx b/Source/cmDSPWriter.cxx
index 87ee5c3..0a1525a 100644
--- a/Source/cmDSPWriter.cxx
+++ b/Source/cmDSPWriter.cxx
@@ -261,6 +261,7 @@ void cmDSPMakefile::WriteDSPEndGroup(std::ostream& fout)
 
 void cmDSPMakefile::SetBuildType(BuildType b)
 {
+  m_BuildType = b;
   switch(b)
     {
     case STATIC_LIBRARY:
diff --git a/Source/cmDSPWriter.h b/Source/cmDSPWriter.h
index 3ed0a42..08b9428 100644
--- a/Source/cmDSPWriter.h
+++ b/Source/cmDSPWriter.h
@@ -39,6 +39,12 @@ public:
    */
   void SetBuildType(BuildType);
 
+  BuildType GetBuildType()
+    {
+      return m_BuildType;
+    }
+  
+
   /**
    * Return array of created DSP names in a STL vector.
    * Each executable must have its own dsp.
@@ -86,7 +92,7 @@ private:
   std::string m_DebugDLLLibraryOptions;
   std::string m_ReleaseDLLLibraryOptions;
   cmMakefile* m_Makefile;
-
+  BuildType m_BuildType;
   std::vector<std::string> m_Configurations;
 };
 
diff --git a/Source/cmDSWMakefile.cxx b/Source/cmDSWMakefile.cxx
index 19fe27f..6534570 100644
--- a/Source/cmDSWMakefile.cxx
+++ b/Source/cmDSWMakefile.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";
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";