honour PYTHONHOME in build procedure

rdeioris · rdeioris · commit 6d530c1fab6e · 2017-05-23T19:50:59.000+02:00
diff --git a/Source/UnrealEnginePython/UnrealEnginePython.Build.cs b/Source/UnrealEnginePython/UnrealEnginePython.Build.cs
@@ -2,6 +2,7 @@
 
 using UnrealBuildTool;
 using System.IO;
+using System.Collections.Generic;
 
 public class UnrealEnginePython : ModuleRules
 {
@@ -157,7 +158,13 @@ public UnrealEnginePython(TargetInfo Target)
 
     private string DiscoverPythonPath(string[] knownPaths)
     {
-        foreach (string path in knownPaths)
+        // insert the PYTHONHOME content as the first known path
+        List<string> paths = new List<string>(knownPaths);
+        string environmentPath = System.Environment.GetEnvironmentVariable("PYTHONHOME");
+        if (!string.IsNullOrEmpty(environmentPath))
+            paths.Insert(0, environmentPath);
+
+        foreach (string path in paths)
         {
             string headerFile = Path.Combine(path, "include", "Python.h");
             if (File.Exists(headerFile))

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`using UnrealBuildTool;`
`4`	`4`	`using System.IO;`
	`5`	`+using System.Collections.Generic;`
`5`	`6`
`6`	`7`	`public class UnrealEnginePython : ModuleRules`
`7`	`8`	`{`
`@@ -157,7 +158,13 @@ public UnrealEnginePython(TargetInfo Target)`
`157`	`158`
`158`	`159`	`private string DiscoverPythonPath(string[] knownPaths)`
`159`	`160`	`{`
`160`		`- foreach (string path in knownPaths)`
	`161`	`+ // insert the PYTHONHOME content as the first known path`
	`162`	`+ List<string> paths = new List<string>(knownPaths);`
	`163`	`+ string environmentPath = System.Environment.GetEnvironmentVariable("PYTHONHOME");`
	`164`	`+ if (!string.IsNullOrEmpty(environmentPath))`
	`165`	`+ paths.Insert(0, environmentPath);`
	`166`	`+`
	`167`	`+ foreach (string path in paths)`
`161`	`168`	`{`
`162`	`169`	`string headerFile = Path.Combine(path, "include", "Python.h");`
`163`	`170`	`if (File.Exists(headerFile))`