From 7e6c287d78d135e5baa7097353652dfed48d74ce Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Wed, 21 Dec 2011 15:21:53 +0000
Subject: [PATCH] Another round of universal fixes

---
 tests/CMakeLists.txt | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2db27bb6..9bf82c0c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -22,9 +22,16 @@ SET(compareRAWimages_SRCS compareRAWimages.c
 
 ADD_EXECUTABLE(comparePGXimages ${comparePGXimages_SRCS})
 TARGET_LINK_LIBRARIES(comparePGXimages
-  ${OPENJPEG_LIBRARY_NAME} ${Z_LIBNAME}
-  ${PNG_LIBNAME} ${TIFF_LIBNAME})
-                                       
+  ${OPENJPEG_LIBRARY_NAME}
+  ${PNG_LIBNAME} ${TIFF_LIBNAME}
+  )
+# To support universal exe:
+IF(ZLIB_FOUND AND APPLE)
+  TARGET_LINK_LIBRARIES(comparePGXimages z)
+ELSe(ZLIB_FOUND AND APPLE)
+  TARGET_LINK_LIBRARIES(comparePGXimages ${Z_LIBNAME})
+ENDIF(ZLIB_FOUND AND APPLE)
+
 ADD_EXECUTABLE(compare_dump_files ${compare_dump_files_SRCS})
 
 ADD_EXECUTABLE(compareRAWimages ${compareRAWimages_SRCS})