From 5d2c2b27a6323e2666378b986129b2a7c2c39e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 6 Feb 2022 16:04:24 +0100
Subject: New upstream version 5.2.2GA

---
 CMake/FindFreeImage.cmake | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'CMake/FindFreeImage.cmake')

diff --git a/CMake/FindFreeImage.cmake b/CMake/FindFreeImage.cmake
index 6073916..b24f98d 100644
--- a/CMake/FindFreeImage.cmake
+++ b/CMake/FindFreeImage.cmake
@@ -12,20 +12,38 @@
 #
 
 if (WIN32)
+    # Folders for x86/x64
+    if (WIN64)
 	find_path( FREEIMAGE_INCLUDE_PATH FreeImage.h
 		PATHS
-    $ENV{XTCEXTERNALROOT}/x86/FreeImage
+	        $ENV{XTCEXTERNALROOT}/x64/FreeImage
 		DOC "The directory where FreeImage.h resides")
 	find_library( FREEIMAGE_LIBRARY
 		NAMES FreeImage freeimage
 		PATHS
-    $ENV{XTCEXTERNALROOT}/x86/FreeImage
+	        $ENV{XTCEXTERNALROOT}/x64/FreeImage
 		DOC "The FreeImage library")
 	find_file( FREEIMAGE_SHAREDLIB
 		NAMES freeimage.DLL
 		PATHS
-    $ENV{XTCEXTERNALROOT}/x86/FreeImage
+	        $ENV{XTCEXTERNALROOT}/x64/FreeImage
 	)
+    else (WIN64)
+	find_path( FREEIMAGE_INCLUDE_PATH FreeImage.h
+		PATHS
+	        $ENV{XTCEXTERNALROOT}/x86/FreeImage
+		DOC "The directory where FreeImage.h resides")
+	find_library( FREEIMAGE_LIBRARY
+		NAMES FreeImage freeimage
+		PATHS
+	        $ENV{XTCEXTERNALROOT}/x86/FreeImage
+		DOC "The FreeImage library")
+	find_file( FREEIMAGE_SHAREDLIB
+		NAMES freeimage.DLL
+		PATHS
+	        $ENV{XTCEXTERNALROOT}/x86/FreeImage
+	)
+    endif (WIN64)
 else (WIN32)
 	find_path( FREEIMAGE_INCLUDE_PATH FreeImage.h
 		/usr/include
-- 
cgit v1.2.3