diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmSystemTools.cxx | 2 | ||||
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 455c5ef..8f20ec5 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -748,7 +748,7 @@ bool cmSystemTools::IsOn(const char* val) bool cmSystemTools::IsOff(const char* val) { - if (!val) + if (!val || strlen(val) == 0) { return true; } diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index d007868..dc7993a 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -501,7 +501,7 @@ void cmUnixMakefileGenerator::OutputTargets(std::ostream& fout) fout << "#\n"; fout << m_LibraryOutputPath << "lib" << l->first << ".a: ${" << l->first << "_SRC_OBJS} \n"; - fout << "\t${CMAKE_AR} cr " + fout << "\t${CMAKE_AR} " << m_LibraryOutputPath << "lib" << l->first << ".a ${" << l->first << "_SRC_OBJS} \n"; fout << "\t${CMAKE_RANLIB} " |