BUG: make sure libraries do not depend on themselves
This commit is contained in:
parent
c1dcaf342a
commit
938e6e487b
|
@ -936,18 +936,21 @@ void cmMSDotNETGenerator::OutputLibraries(std::ostream& fout,
|
||||||
cmTarget::LinkLibraries::const_iterator j;
|
cmTarget::LinkLibraries::const_iterator j;
|
||||||
for(j = libs.begin(); j != libs.end(); ++j)
|
for(j = libs.begin(); j != libs.end(); ++j)
|
||||||
{
|
{
|
||||||
std::string lib = j->first;
|
if(j->first != libName)
|
||||||
if(j->first.find(".lib") == std::string::npos)
|
|
||||||
{
|
{
|
||||||
lib += ".lib";
|
std::string lib = j->first;
|
||||||
|
if(j->first.find(".lib") == std::string::npos)
|
||||||
|
{
|
||||||
|
lib += ".lib";
|
||||||
|
}
|
||||||
|
lib = this->ConvertToXMLOutputPath(lib.c_str());
|
||||||
|
if (j->second == cmTarget::GENERAL
|
||||||
|
|| (j->second == cmTarget::DEBUG && strcmp(configName, "DEBUG") == 0)
|
||||||
|
|| (j->second == cmTarget::OPTIMIZED && strcmp(configName, "DEBUG") != 0))
|
||||||
|
{
|
||||||
|
fout << lib << " ";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
lib = this->ConvertToXMLOutputPath(lib.c_str());
|
|
||||||
if (j->second == cmTarget::GENERAL
|
|
||||||
|| (j->second == cmTarget::DEBUG && strcmp(configName, "DEBUG") == 0)
|
|
||||||
|| (j->second == cmTarget::OPTIMIZED && strcmp(configName, "DEBUG") != 0))
|
|
||||||
{
|
|
||||||
fout << lib << " ";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue