From f488ef88726de28d2596c2bed13b470e601c9908 Mon Sep 17 00:00:00 2001 From: Adrian Page Date: Mon, 10 Sep 2007 20:27:04 +0000 Subject: - Look for OpenEXR headers in the standard sub-directory of default paths too. - OPENEXR_DLL must be defined to use OpenEXR on windows. svn path=/trunk/KDE/kdelibs/; revision=710757 --- modules/FindOpenEXR.cmake | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index f7f78bf9..33560ff5 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -4,6 +4,7 @@ # OPENEXR_FOUND - system has OpenEXR # OPENEXR_INCLUDE_DIR - OpenEXR include directory # OPENEXR_LIBRARIES - Libraries needed to use OpenEXR +# OPENEXR_DEFINITIONS - definitions required to use OpenEXR # # Copyright (c) 2006, Alexander Neundorf, # @@ -25,7 +26,7 @@ IF (NOT WIN32) ENDIF (NOT WIN32) FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h ${_OpenEXRIncDir} - ${_OpenEXRIncDir}/OpenEXR/ + PATH_SUFFIXES /OpenEXR/ ) FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half @@ -60,6 +61,15 @@ ENDIF (NOT WIN32) if (OPENEXR_INCLUDE_DIR 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") + + if (WIN32) + set(_OPENEXR_DEFINITIONS -DOPENEXR_DLL) + else (WIN32) + set(_OPENEXR_DEFINITIONS) + endif (WIN32) + + set(OPENEXR_DEFINITIONS ${_OPENEXR_DEFINITIONS} CACHE STRING "Definitions needed to use OpenEXR") + endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) @@ -80,6 +90,7 @@ ENDIF (NOT WIN32) OPENEXR_ILMIMF_LIBRARY OPENEXR_IMATH_LIBRARY OPENEXR_IEX_LIBRARY - OPENEXR_HALF_LIBRARY ) + OPENEXR_HALF_LIBRARY + OPENEXR_DEFINITIONS ) endif (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES) -- cgit v1.2.1