Commit af30fe67 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

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

parent d0a87947
......@@ -261,6 +261,7 @@ void cmDSPMakefile::WriteDSPEndGroup(std::ostream& fout)
void cmDSPMakefile::SetBuildType(BuildType b)
{
m_BuildType = b;
switch(b)
{
case STATIC_LIBRARY:
......
......@@ -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;
};
......
......@@ -261,6 +261,7 @@ void cmDSPMakefile::WriteDSPEndGroup(std::ostream& fout)
void cmDSPMakefile::SetBuildType(BuildType b)
{
m_BuildType = b;
switch(b)
{
case STATIC_LIBRARY:
......
......@@ -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;
};
......
......@@ -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";
......
......@@ -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";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment