UE5 compatibility fixes (#13)

adamrehn · Aug 29, 2021 · dbbd625 · dbbd625
1 parent ce631e0
commit dbbd625
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/conan_ue4cli/commands/boilerplate.py b/conan_ue4cli/commands/boilerplate.py
@@ -18,15 +18,16 @@ def boilerplate(manager, argv):
 
 	# Verify that the detected version of UE4 is new enough
 	versionFull = manager.getEngineVersion()
+	versionMajor = int(manager.getEngineVersion('major'))
 	versionMinor = int(manager.getEngineVersion('minor'))
-	if versionMinor < 19:
+	if versionMajor < 4 or (versionMajor == 4 and versionMinor < 19):
 		print('Error: the detected UE4 version ({}) is too old. 4.19.0 or newer is required.'.format(versionFull), file=sys.stderr)
 		sys.exit(1)
 
 	# Select the appropriate template version for the detected version of UE4
-	if versionMinor == 19:
+	if versionMajor == 4 and versionMinor == 19:
 		templateVersion = 1
-	elif versionMinor >= 20 and versionMinor <= 23:
+	elif versionMajor == 4 and versionMinor >= 20 and versionMinor <= 23:
 		templateVersion = 2
 	else:
 		templateVersion = 3

diff --git a/conan_ue4cli/commands/generate.py b/conan_ue4cli/commands/generate.py
@@ -19,14 +19,15 @@ def _locateClang(manager, architecture='x86_64'):
 	'''
 
 	# Retrieve the minor version number for the supplied Unreal Engine installation
+	versionMajor = int(manager.getEngineVersion('major'))
 	versionMinor = int(manager.getEngineVersion('minor'))
-	
+
 	# Check if the Unreal Engine installation has a bundled version of clang (introduced in UE4.20.0)
 	engineRoot = manager.getEngineRoot()
 	bundledClang = glob.glob(join(engineRoot, 'Engine/Extras/ThirdPartyNotUE/SDKs/HostLinux/Linux_x64/*clang*/*{}*/bin/clang'.format(architecture)))
 	if len(bundledClang) != 0:
 		return (bundledClang[0], bundledClang[0] + '++', None)
-	elif versionMinor == 19:
+	elif versionMajor == 4 and versionMinor == 19:
 
 		# For Unreal Engine 4.19, download the bundled toolchain from 4.20 and use that
 		print("Downloading toolchain bundle since Unreal Engine 4.19 doesn't include one...")
@@ -54,8 +55,9 @@ def generate(manager, argv):
 
 	# Verify that the detected version of UE4 is new enough
 	versionFull = manager.getEngineVersion()
+	versionMajor = int(manager.getEngineVersion('major'))
 	versionMinor = int(manager.getEngineVersion('minor'))
-	if versionMinor < 19:
+	if versionMajor < 4 or (versionMajor == 4 and versionMinor < 19):
 		print('Warning: the detected UE4 version ({}) is too old (4.19.0 or newer required), skipping installation.'.format(versionFull), file=sys.stderr)
 		return