Fix errors in cmake files.

cmake/FindOpenEXR.cmake

@@ -3,53 +3,75 @@
 # Once done this will define:
 #
 # OPENEXR_FOUND = OpenEXR found. 
-# OPENEXR_INCLUDE_PATH = OpenEXR include directory.
+# OPENEXR_INCLUDE_PATHS = OpenEXR include directories.
 # OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR.
 # 
 
+INCLUDE(FindZLIB)
 
-IF (WIN32)
+
-ELSE (WIN32)
+IF(ZLIB_FOUND)
+
+	SET(LIBRARY_PATHS 
+		/usr/lib
+		/usr/local/lib
+		/sw/lib
+		/opt/local/lib
+		$ENV{PROGRAM_FILES}/OpenEXR/lib/static)
 
 	FIND_PATH(OPENEXR_INCLUDE_PATH ImfRgbaFile.h
+		PATH_SUFFIXES OpenEXR
 		/usr/include
 		/usr/local/include
-		/usr/include/OpenEXR
+		/sw/include
-		/usr/local/include/OpenEXR)
+		/opt/local/include)
 
 	FIND_LIBRARY(OPENEXR_HALF_LIBRARY 
 		NAMES Half
-		PATHS
+		PATHS ${LIBRARY_PATHS})
-			/usr/lib
-			/usr/local/lib)
   
 	FIND_LIBRARY(OPENEXR_IEX_LIBRARY 
 		NAMES Iex
-		PATHS
+		PATHS ${LIBRARY_PATHS})
-			/usr/lib
-			/usr/local/lib)
  
 	FIND_LIBRARY(OPENEXR_IMATH_LIBRARY
 		NAMES Imath
-		PATHS
+		PATHS ${LIBRARY_PATHS})
-			/usr/lib
-			/usr/local/lib)
   
 	FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY
 		NAMES IlmImf
-		PATHS
+		PATHS ${LIBRARY_PATHS})
-			/usr/lib
+
-			/usr/local/lib)
+	FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY
+		NAMES IlmThread
+		PATHS ${LIBRARY_PATHS})
+
+ENDIF(ZLIB_FOUND)
 
-ENDIF (WIN32)
+#MESSAGE(STATUS ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ZLIB_LIBRARY})
 
 IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
 	SET(OPENEXR_FOUND TRUE)
-	SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR")
+	SET(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR")
+	SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${ZLIB_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR")
+
+	IF(OPENEXR_ILMTHREAD_LIBRARY)
+		SET(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES} ${OPENEXR_ILMTHREAD_LIBRARY})
+	ENDIF(OPENEXR_ILMTHREAD_LIBRARY)
 ENDIF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
 
+IF(OPENEXR_FOUND)
+	IF(NOT OPENEXR_FIND_QUIETLY)
+		MESSAGE(STATUS "Found OpenEXR: ${OPENEXR_ILMIMF_LIBRARY}")
+	ENDIF(NOT OPENEXR_FIND_QUIETLY)
+ELSE(OPENEXR_FOUND)
+	IF(OPENEXR_FIND_REQUIRED)
+		MESSAGE(FATAL_ERROR "Could not find OpenEXR library")
+	ENDIF(OPENEXR_FIND_REQUIRED)
+ENDIF(OPENEXR_FOUND)
+
 MARK_AS_ADVANCED(
-	OPENEXR_INCLUDE_DIR
+	OPENEXR_INCLUDE_PATHS
 	OPENEXR_LIBRARIES
 	OPENEXR_ILMIMF_LIBRARY
 	OPENEXR_IMATH_LIBRARY