From ea2ead5dd6634cdc05757af0730216b3d7e03232 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Thu, 16 Feb 2006 21:50:11 +0000 Subject: -replace -fexceptions with ${KDE4_ENABLE_EXCEPTIONS} (I'm not sure this is a good name for the variable) -add install rules for the cmake files in kdelibs/cmake/modules/ -remove debug output and fix typo in FindOpenEXR.cmake Alex svn path=/trunk/KDE/kdelibs/; revision=510319 --- modules/FindOpenEXR.cmake | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'modules/FindOpenEXR.cmake') diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 5539fa59..91ca3621 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -8,14 +8,12 @@ PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflag #PKGCONFIG(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags) FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h -${_OpenEXRIncDir} -${_OpenEXRIncDir}/OpenEXR/ -/usr/include -/usr/local/include + ${_OpenEXRIncDir} + ${_OpenEXRIncDir}/OpenEXR/ + /usr/include + /usr/local/include ) -message(STATUS "OPENEXR_INCLUDE_DIR :${OPENEXR_INCLUDE_DIR}") - FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS ${_OPENEXRLinkDir} @@ -46,14 +44,12 @@ FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf /usr/local/lib ) -message(STATUS "OPENEXR_IMATH_LIBRARIES: ${OPENEXR_IMATH_LIBRARY}, OPENEXR_ILMIMF_LIBRARY: ${OPENEXR_ILMIMF_LIBRARY}, OPENEXR_IEX_LIBRARY: ${OPENEXR_IEX_LIBRARY}, OPENEXR_HALF_LIBRARY: ${OPENEXR_HALF_LIBRARY}") +set( OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ) -set( OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} - ${OPENEXR_IMATH__LIBRARY}...) -if(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) - set(OPENEXR_FOUND TRUE) +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}) -endif(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) +endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) -- cgit v1.2.1