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/FindZlib.cmake | 43 ++++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 13 deletions(-)

(limited to 'CMake/FindZlib.cmake')

diff --git a/CMake/FindZlib.cmake b/CMake/FindZlib.cmake
index 3305ee3..3ad5b6c 100644
--- a/CMake/FindZlib.cmake
+++ b/CMake/FindZlib.cmake
@@ -10,19 +10,36 @@
 #
 
 if(WIN32)
-  find_path( ZLIB_INCLUDE_DIR zlib.h
-    PATHS
-    $ENV{XTCEXTERNALROOT}/x86/zlib
-    DOC "The directory where zip.h resides")
-  find_library( ZLIB_LIBRARY
-    NAMES zlib Zlib
-    PATHS
-    $ENV{XTCEXTERNALROOT}/x86/zlib
-    DOC "The zlib library")
-  find_file( ZLIB_SHAREDLIB
-    NAMES zlib.dll Zlib.dll
-    PATHS
-    $ENV{XTCEXTERNALROOT}/x86/zlib)
+  # Folders for x86/x64
+  if (WIN64)
+    find_path( ZLIB_INCLUDE_DIR zlib.h
+      PATHS
+      $ENV{XTCEXTERNALROOT}/x64/zlib
+      DOC "The directory where zlib.h resides")
+    find_library( ZLIB_LIBRARY
+      NAMES zlib Zlib
+      PATHS
+      $ENV{XTCEXTERNALROOT}/x64/zlib
+      DOC "The zlib library")
+    find_file( ZLIB_SHAREDLIB
+      NAMES zlib.dll Zlib.dll
+      PATHS
+      $ENV{XTCEXTERNALROOT}/x64/zlib)
+  else (WIN64)
+    find_path( ZLIB_INCLUDE_DIR zlib.h
+      PATHS
+      $ENV{XTCEXTERNALROOT}/x86/zlib
+      DOC "The directory where zlib.h resides")
+    find_library( ZLIB_LIBRARY
+      NAMES zlib Zlib
+      PATHS
+      $ENV{XTCEXTERNALROOT}/x86/zlib
+      DOC "The zlib library")
+    find_file( ZLIB_SHAREDLIB
+      NAMES zlib.dll Zlib.dll
+      PATHS
+      $ENV{XTCEXTERNALROOT}/x86/zlib)
+  endif (WIN64)
 else(WIN32)
   find_package(PkgConfig)
   pkg_check_modules(PC_ZLIB QUIET zlib)
-- 
cgit v1.2.3