Fixed undefined cmake variable at root variable tree.

kekyo · Oct 17, 2021 · a665cf8 · a665cf8
1 parent 343fa03
commit a665cf8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/IL2C.Core.Test.Fixture/CMakeDriver.cs b/tests/IL2C.Core.Test.Fixture/CMakeDriver.cs
@@ -137,8 +137,8 @@ public static async Task<string> BuildAsync(
 
             // Step1: Execute gcc
             var (gccExitCode, gccLog) = await TestUtilities.ExecuteAsync(
-                outPath, new[] { binPath },
-                Path.Combine(binPath, isWindows ? "gcc.exe" : "gcc"),
+                outPath, isWindows ? new[] { binPath } : Array.Empty<string>(),
+                isWindows ? Path.Combine(binPath, "gcc.exe") : "gcc",   // NOT windows: uses system default gcc.
                 $"-I{basePath}",
                 incDir,
                 libDir,

diff --git a/tests/IL2C.Core.Test.Fixture/CMakeListsSimpleParser.cs b/tests/IL2C.Core.Test.Fixture/CMakeListsSimpleParser.cs
@@ -132,7 +132,7 @@ private static IEnumerable<Func<string>> SplitArguments(string args, Dictionary<
                             }
                             else
                             {
-                                exprs.Add(() => definitions[fxd]());
+                                exprs.Add(() => definitions.TryGetValue(fxd, out var value) ? value() : string.Empty);
                             }
                             state = 0;
                             index++;