Commit 1f8f58a0 authored by Alexander Neundorf's avatar Alexander Neundorf

fix #13195: avoid multiple mentions of found packages

Now before adding a package to the list of found or not-found
packages, the package is remvoed from both lists before.

Alex
parent b4a189fd
......@@ -1368,41 +1368,73 @@ bool cmFindPackageCommand::ReadListFile(const char* f, PolicyScopeRule psr)
}
//----------------------------------------------------------------------------
void cmFindPackageCommand::AppendToProperty(const char* propertyName)
void cmFindPackageCommand::AppendToFoundProperty(bool found)
{
std::string propertyValue;
const char *prop =
this->Makefile->GetCMakeInstance()->GetProperty(propertyName);
if (prop && *prop)
std::vector<std::string> foundContents;
const char *foundProp =
this->Makefile->GetCMakeInstance()->GetProperty("PACKAGES_FOUND");
if (foundProp && *foundProp)
{
propertyValue = prop;
std::string tmp = foundProp;
std::vector<std::string> contents;
cmSystemTools::ExpandListArgument(propertyValue, contents, false);
bool alreadyInserted = false;
for(std::vector<std::string>::const_iterator it = contents.begin();
it != contents.end(); ++ it )
cmSystemTools::ExpandListArgument(tmp, foundContents, false);
std::vector<std::string>::iterator nameIt = std::find(
foundContents.begin(), foundContents.end(), this->Name);
if(nameIt != foundContents.end())
{
if (*it == this->Name)
{
alreadyInserted = true;
break;
}
foundContents.erase(nameIt);
}
if (!alreadyInserted)
}
std::vector<std::string> notFoundContents;
const char *notFoundProp =
this->Makefile->GetCMakeInstance()->GetProperty("PACKAGES_NOT_FOUND");
if (notFoundProp && *notFoundProp)
{
std::string tmp = notFoundProp;
cmSystemTools::ExpandListArgument(tmp, notFoundContents, false);
std::vector<std::string>::iterator nameIt = std::find(
notFoundContents.begin(), notFoundContents.end(), this->Name);
if(nameIt != notFoundContents.end())
{
propertyValue += ";";
propertyValue += this->Name;
notFoundContents.erase(nameIt);
}
}
if(found)
{
foundContents.push_back(this->Name);
}
else
{
propertyValue = this->Name;
notFoundContents.push_back(this->Name);
}
std::string tmp;
const char* sep ="";
for(size_t i=0; i<foundContents.size(); i++)
{
tmp += sep;
tmp += foundContents[i];
sep = ";";
}
this->Makefile->GetCMakeInstance()->SetProperty("PACKAGES_FOUND",
tmp.c_str());
tmp = "";
sep = "";
for(size_t i=0; i<notFoundContents.size(); i++)
{
tmp += sep;
tmp += notFoundContents[i];
sep = ";";
}
this->Makefile->GetCMakeInstance()->SetProperty(propertyName,
propertyValue.c_str());
}
this->Makefile->GetCMakeInstance()->SetProperty("PACKAGES_NOT_FOUND",
tmp.c_str());
}
//----------------------------------------------------------------------------
void cmFindPackageCommand::AppendSuccessInformation()
......@@ -1413,14 +1445,10 @@ void cmFindPackageCommand::AppendSuccessInformation()
const char* upperResult = this->Makefile->GetDefinition(upperFound.c_str());
const char* result = this->Makefile->GetDefinition(found.c_str());
if ((cmSystemTools::IsOn(result)) || (cmSystemTools::IsOn(upperResult)))
{
this->AppendToProperty("PACKAGES_FOUND");
}
else
{
this->AppendToProperty("PACKAGES_NOT_FOUND");
}
bool packageFound = ((cmSystemTools::IsOn(result))
|| (cmSystemTools::IsOn(upperResult)));
this->AppendToFoundProperty(packageFound);
// Record whether the find was quiet or not, so this can be used
// e.g. in FeatureSummary.cmake
......
......@@ -69,7 +69,7 @@ protected:
virtual void GenerateDocumentation();
private:
void AppendSuccessInformation();
void AppendToProperty(const char* propertyName);
void AppendToFoundProperty(bool found);
void SetModuleVariables(const std::string& components);
bool FindModule(bool& found);
void AddFindDefinition(const char* var, const char* val);
......
Markdown is supported
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