fallback in case of parse fail

sdkrystian · Jan 26, 2024 · 113ecbc · 113ecbc
1 parent 3d3f398
commit 113ecbc
Showing 1 changed file with 10 additions and 2 deletions.
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")