fallback in case of parse fail

fpelliccioni · alandefreitas · commit 113ecbc86ec4 · 2024-01-26T18:04:04.000-03:00
diff --git a/src/lib/Lib/CMakeExecution.cpp b/src/lib/Lib/CMakeExecution.cpp
@@ -161,14 +161,22 @@ getCmakeDefaultGenerator(llvm::StringRef cmakePath)
     if (cmakeHelpExp)
     {
         std::string const cmakeHelp = *std::move(cmakeHelpExp);
-        return parseCmakeHelpOutput(cmakeHelp);
+        auto const r = parseCmakeHelpOutput(cmakeHelp);
+        if (r)
+        {
+            return *r;
+        }
     }
 
     Expected<std::string> const cmakeSystemInformationExp = executeCmakeSystemInformation(cmakePath);
     if (cmakeSystemInformationExp)
     {
         std::string const cmakeSystemInformation = *std::move(cmakeSystemInformationExp);
-        return parseCmakeSystemInformationOutput(cmakeSystemInformation);
+        auto const r = parseCmakeSystemInformationOutput(cmakeSystemInformation);
+        if (r)
+        {
+            return *r;
+        }
     }
 
     if (llvm::sys::path::extension(cmakePath) == ".exe")

Original file line number	Diff line number	Diff line change
`@@ -161,14 +161,22 @@ getCmakeDefaultGenerator(llvm::StringRef cmakePath)`
`161`	`161`	`if (cmakeHelpExp)`
`162`	`162`	`{`
`163`	`163`	`std::string const cmakeHelp = *std::move(cmakeHelpExp);`
`164`		`- return parseCmakeHelpOutput(cmakeHelp);`
	`164`	`+ auto const r = parseCmakeHelpOutput(cmakeHelp);`
	`165`	`+ if (r)`
	`166`	`+ {`
	`167`	`+ return *r;`
	`168`	`+ }`
`165`	`169`	`}`
`166`	`170`
`167`	`171`	`Expected<std::string> const cmakeSystemInformationExp = executeCmakeSystemInformation(cmakePath);`
`168`	`172`	`if (cmakeSystemInformationExp)`
`169`	`173`	`{`
`170`	`174`	`std::string const cmakeSystemInformation = *std::move(cmakeSystemInformationExp);`
`171`		`- return parseCmakeSystemInformationOutput(cmakeSystemInformation);`
	`175`	`+ auto const r = parseCmakeSystemInformationOutput(cmakeSystemInformation);`
	`176`	`+ if (r)`
	`177`	`+ {`
	`178`	`+ return *r;`
	`179`	`+ }`
`172`	`180`	`}`
`173`	`181`
`174`	`182`	`if (llvm::sys::path::extension(cmakePath) == ".exe")`