Fix compilation of Shipping targets

slonopotamus · Aug 5, 2024 · 5334e76 · 5334e76
1 parent ff6832a
commit 5334e76
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 16 deletions.
diff --git a/Source/UEST/Public/UEST.h b/Source/UEST/Public/UEST.h
@@ -1,10 +1,23 @@
 #pragma once
 
+#if WITH_UNREAL_DEVELOPER_TOOLS
 #include "Assert/CQTestConvert.h"
+#endif
+
 #include "Misc/AutomationTest.h"
 
 namespace UEST
 {
+	template<typename T>
+	static FString ToString(const T& Value)
+	{
+#if WITH_UNREAL_DEVELOPER_TOOLS
+		return CQTestConvert::ToString(Value);
+#else
+		return TEXT("UNKNOWN");
+#endif
+	}
+
 	template<typename T>
 	// TODO: Make this FNoncopyable?
 	struct IMatcher
@@ -130,7 +143,7 @@ namespace UEST
 
 			virtual FString Describe() const override
 			{
-				return FString::Printf(TEXT("be equal to %s"), *CQTestConvert::ToString(Expected));
+				return FString::Printf(TEXT("be equal to %s"), *ToString(Expected));
 			}
 		};
 
@@ -152,7 +165,7 @@ namespace UEST
 
 			virtual FString Describe() const override
 			{
-				return FString::Printf(TEXT("be less than %s"), *CQTestConvert::ToString(Expected));
+				return FString::Printf(TEXT("be less than %s"), *ToString(Expected));
 			}
 		};
 
@@ -174,7 +187,7 @@ namespace UEST
 
 			virtual FString Describe() const override
 			{
-				return FString::Printf(TEXT("be less than or equal to %s"), *CQTestConvert::ToString(Expected));
+				return FString::Printf(TEXT("be less than or equal to %s"), *ToString(Expected));
 			}
 		};
 
@@ -196,7 +209,7 @@ namespace UEST
 
 			virtual FString Describe() const override
 			{
-				return FString::Printf(TEXT("be greater than %s"), *CQTestConvert::ToString(Expected));
+				return FString::Printf(TEXT("be greater than %s"), *ToString(Expected));
 			}
 		};
 
@@ -218,7 +231,7 @@ namespace UEST
 
 			virtual FString Describe() const override
 			{
-				return FString::Printf(TEXT("be greater than or equal to %s"), *CQTestConvert::ToString(Expected));
+				return FString::Printf(TEXT("be greater than or equal to %s"), *ToString(Expected));
 			}
 		};
 
@@ -247,7 +260,7 @@ namespace UEST
 
 			virtual FString Describe() const override
 			{
-				return FString::Printf(TEXT("be in range from %s to %s"), *CQTestConvert::ToString(From), *CQTestConvert::ToString(To));
+				return FString::Printf(TEXT("be in range from %s to %s"), *ToString(From), *ToString(To));
 			}
 		};
 

diff --git a/Source/UEST/UEST.Build.cs b/Source/UEST/UEST.Build.cs
@@ -4,17 +4,22 @@ public class UEST : ModuleRules
 {
 	public UEST(ReadOnlyTargetRules Target) : base(Target)
 	{
-		PublicDependencyModuleNames.AddRange(
-			new[]
+		PublicDependencyModuleNames.AddRange(new[]
+		{
+			"Boost",
+			"Core",
+			"CoreUObject",
+			"Engine",
+			"EngineSettings",
+			"IrisCore",
+		});
+
+		if (Target.bBuildDeveloperTools)
+		{
+			PublicDependencyModuleNames.AddRange(new[]
 			{
-				"Boost",
-				"Core",
-				"CoreUObject",
 				"CQTest",
-				"Engine",
-				"EngineSettings",
-				"IrisCore",
-			}
-		);
+			});
+		}
 	}
 }