compiler warning
This commit is contained in:
parent
6c3aaa42b7
commit
c1b92d2ea0
@ -17,7 +17,7 @@
|
|||||||
#include "cmEndIfCommand.h"
|
#include "cmEndIfCommand.h"
|
||||||
#include "cmCacheManager.h"
|
#include "cmCacheManager.h"
|
||||||
|
|
||||||
bool cmEndIfCommand::InitialPass(std::vector<std::string> const& args)
|
bool cmEndIfCommand::InitialPass(std::vector<std::string> const&)
|
||||||
{
|
{
|
||||||
this->SetError("An ENDIF command was found outside of a proper IF ENDIF structure. Or its arguments did not match the opening IF command.");
|
this->SetError("An ENDIF command was found outside of a proper IF ENDIF structure. Or its arguments did not match the opening IF command.");
|
||||||
return false;
|
return false;
|
||||||
|
@ -406,11 +406,11 @@ void cmLocalUnixMakefileGenerator::OutputTargetRules(std::ostream& fout)
|
|||||||
}
|
}
|
||||||
fout << "\n\n";
|
fout << "\n\n";
|
||||||
const char * qt_files = m_Makefile->GetDefinition("GENERATED_QT_FILES");
|
const char * qt_files = m_Makefile->GetDefinition("GENERATED_QT_FILES");
|
||||||
if (m_Makefile->GetDefinition("GENERATED_QT_FILES")!=NULL &&
|
if (qt_files != NULL &&
|
||||||
strlen(m_Makefile->GetDefinition("GENERATED_QT_FILES"))>0)
|
strlen(m_Makefile->GetDefinition("GENERATED_QT_FILES"))>0)
|
||||||
{
|
{
|
||||||
fout << "GENERATED_QT_FILES = ";
|
fout << "GENERATED_QT_FILES = ";
|
||||||
fout << m_Makefile->GetDefinition("GENERATED_QT_FILES");
|
fout << qt_files;
|
||||||
fout << "\n\n";
|
fout << "\n\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user