kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: fix for bug 1702, better error message for GUID missing

Browse Source
This commit is contained in:
Bill Hoffman 2005-04-05 10:22:18 -04:00
parent 389f24f777
commit 0255dab023
2 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmGlobalVisualStudio71Generator.cxx
View File

@ -295,8 +295,17 @@ void cmGlobalVisualStudio71Generator::WriteProjectDepends(std::ostream& fout,
// target names anyways. // target names anyways.
name.erase(name.begin(), name.begin() + 27); name.erase(name.begin(), name.begin() + 27);
} }
fout << "\t\t{" << this->GetGUID(name.c_str()) << "} = {" std::string guid = this->GetGUID(name.c_str());
<< this->GetGUID(name.c_str()) << "}\n"; if(guid.size() == 0)
{
std::string m = "Target: ";
m += target.GetName();
m += " depends on unknown target: ";
m += name;
cmSystemTools::Error(m.c_str());
}
fout << "\t\t{" << guid << "} = {" << guid << "}\n";
} }
} }
} }

40
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -435,8 +435,18 @@ void cmGlobalVisualStudio7Generator::WriteSLNFile(std::ostream& fout,
int depcount = 0; int depcount = 0;
for(iter = depends.begin(); iter != depends.end(); ++iter) for(iter = depends.begin(); iter != depends.end(); ++iter)
{ {
std::string guid = this->GetGUID(iter->c_str());
if(guid.size() == 0)
{
std::string m = "Target: ";
m += l->first;
m += " depends on unknown target: ";
m += iter->c_str();
cmSystemTools::Error(m.c_str());
}
fout << "\t\t{" << this->GetGUID(name.c_str()) << "}." << depcount << " = {" fout << "\t\t{" << this->GetGUID(name.c_str()) << "}." << depcount << " = {"
<< this->GetGUID(iter->c_str()) << "}\n"; << guid.c_str() << "}\n";
depcount++; depcount++;
} }
} }
@ -532,8 +542,18 @@ void cmGlobalVisualStudio7Generator::WriteProjectDepends(std::ostream& fout,
= m_CMakeInstance->GetCacheDefinition(libPath.c_str()); = m_CMakeInstance->GetCacheDefinition(libPath.c_str());
if(cacheValue && *cacheValue) if(cacheValue && *cacheValue)
{ {
std::string guid = this->GetGUID(j->first.c_str());
if(guid.size() == 0)
{
std::string m = "Target: ";
m += dspname;
m += " depends on unknown target: ";
m += j->first.c_str();
cmSystemTools::Error(m.c_str());
}
fout << "\t\t{" << this->GetGUID(dspname) << "}." << depcount << " = {" fout << "\t\t{" << this->GetGUID(dspname) << "}." << depcount << " = {"
<< this->GetGUID(j->first.c_str()) << "}\n"; << guid << "}\n";
depcount++; depcount++;
} }
} }
@ -559,8 +579,18 @@ void cmGlobalVisualStudio7Generator::WriteProjectDepends(std::ostream& fout,
// target names anyways. // target names anyways.
name.erase(name.begin(), name.begin() + 27); name.erase(name.begin(), name.begin() + 27);
} }
std::string guid = this->GetGUID(name.c_str());
if(guid.size() == 0)
{
std::string m = "Target: ";
m += dspname;
m += " depends on unknown target: ";
m += name.c_str();
cmSystemTools::Error(m.c_str());
}
fout << "\t\t{" << this->GetGUID(dspname) << "}." << depcount << " = {" fout << "\t\t{" << this->GetGUID(dspname) << "}." << depcount << " = {"
<< this->GetGUID(name.c_str()) << "}\n"; << guid << "}\n";
depcount++; depcount++;
} }
} }
@ -634,9 +664,9 @@ std::string cmGlobalVisualStudio7Generator::GetGUID(const char* name)
{ {
return std::string(storedGUID); return std::string(storedGUID);
} }
cmSystemTools::Error("Internal CMake Error, Could not find GUID for target: ", cmSystemTools::Error("Unknown Target referenced : ",
name); name);
return guidStoreName; return "";
} }