cmMakefile: Avoid name conflict with Solaris global typedef
On Solaris there is a global typedef called 'single': /usr/include/floatingpoint.h:77:15: note: shadowed declaration is here typedef float single; Avoid shadowing it by using a different name.
This commit is contained in:
parent
11733d2dae
commit
e67e0155d9
|
@ -3218,7 +3218,7 @@ void cmMakefile::AddDefaultDefinitions()
|
|||
//----------------------------------------------------------------------------
|
||||
std::string
|
||||
cmMakefile::GetConfigurations(std::vector<std::string>& configs,
|
||||
bool single) const
|
||||
bool singleConfig) const
|
||||
{
|
||||
if(this->GetGlobalGenerator()->IsMultiConfig())
|
||||
{
|
||||
|
@ -3232,7 +3232,7 @@ cmMakefile::GetConfigurations(std::vector<std::string>& configs,
|
|||
else
|
||||
{
|
||||
const std::string& buildType = this->GetSafeDefinition("CMAKE_BUILD_TYPE");
|
||||
if(single && !buildType.empty())
|
||||
if(singleConfig && !buildType.empty())
|
||||
{
|
||||
configs.push_back(buildType);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue