diff options
| -rw-r--r-- | Source/cmEndIfCommand.cxx | 2 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmEndIfCommand.cxx b/Source/cmEndIfCommand.cxx index f91c38e..7dd1db0 100644 --- a/Source/cmEndIfCommand.cxx +++ b/Source/cmEndIfCommand.cxx @@ -17,7 +17,7 @@ #include "cmEndIfCommand.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."); return false; diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index d84948d..dcd53d4 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -406,11 +406,11 @@ void cmLocalUnixMakefileGenerator::OutputTargetRules(std::ostream& fout) } fout << "\n\n"; 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) { fout << "GENERATED_QT_FILES = "; - fout << m_Makefile->GetDefinition("GENERATED_QT_FILES"); + fout << qt_files; fout << "\n\n"; } } |