From 8d8c3be72bf03816ed8c273d59061b862ae27075 Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Fri, 19 Aug 2005 10:13:04 -0400 Subject: BUG: If the scanner is not defined this would crash. For example when using new language --- Source/cmLocalUnixMakefileGenerator3.cxx | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index f397106..fc05201 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -2830,26 +2830,26 @@ cmLocalUnixMakefileGenerator3 } #endif - // for each file we need to scan - std::string srcLang = "CMAKE_DEPENDS_CHECK_"; - srcLang += lang; - const char *srcStr = mf->GetSafeDefinition(srcLang.c_str()); - std::vector srcs; - cmSystemTools::ExpandListArgument(srcStr, srcs); - for (std::vector::iterator si = - srcs.begin(); si != srcs.end(); ++si) - { - std::string &src = *si; - ++si; - // make sure the object file is relative to home output - std::string obj = *si; - obj = lg->Convert(obj.c_str(),HOME_OUTPUT,MAKEFILE); - scanner->Write(src.c_str(),obj.c_str(),ruleFileStream); - } - - // free the scanner for this language if (scanner) { + // for each file we need to scan + std::string srcLang = "CMAKE_DEPENDS_CHECK_"; + srcLang += lang; + const char *srcStr = mf->GetSafeDefinition(srcLang.c_str()); + std::vector srcs; + cmSystemTools::ExpandListArgument(srcStr, srcs); + for (std::vector::iterator si = + srcs.begin(); si != srcs.end(); ++si) + { + std::string &src = *si; + ++si; + // make sure the object file is relative to home output + std::string obj = *si; + obj = lg->Convert(obj.c_str(),HOME_OUTPUT,MAKEFILE); + scanner->Write(src.c_str(),obj.c_str(),ruleFileStream); + } + + // free the scanner for this language delete scanner; } } -- cgit v0.12