From e69405f99a2e00444374c48eec33d57b9acc16e9 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 10 Jun 2015 16:48:28 +0000 Subject: [PATCH] From Laurens Voerman, "attached is a zip with the files: OpenSceneGraph\CMakeModules\FindOpenEXR.cmake I introduced a bug in the previous submission pointed out by Dmitry Marakasov: looking for IlmIlf instead of IlmImf (as the previous version did - but using variable OPENEXR_IlmIlf_LIBRARY) For some reason google decided his message was spam, so I just noticed it, and I reply to confirm his remarks and attach a full file. " git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14908 16af8721-9629-0410-8352-f15c8da7e697 --- CMakeModules/FindOpenEXR.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeModules/FindOpenEXR.cmake b/CMakeModules/FindOpenEXR.cmake index 9e4feb69d..743df98fb 100644 --- a/CMakeModules/FindOpenEXR.cmake +++ b/CMakeModules/FindOpenEXR.cmake @@ -25,7 +25,7 @@ FIND_PATH(OPENEXR_INCLUDE_DIR OpenEXR/ImfIO.h ) # Macro to find exr libraries (deduplicating search paths) -# example: OPENEXR_FIND_VAR(OPENEXR_IlmIlf_LIBRARY IlmIlf) +# example: OPENEXR_FIND_VAR(OPENEXR_IlmImf_LIBRARY IlmImf) MACRO(OPENEXR_FIND_VAR varname libname) FIND_LIBRARY( ${varname} NAMES ${libname} @@ -45,20 +45,20 @@ MACRO(OPENEXR_FIND_VAR varname libname) ENDMACRO(OPENEXR_FIND_VAR) # Macro to find exr libraries (and debug versions) -# example: OPENEXR_FIND(IlmIlf) +# example: OPENEXR_FIND(IlmImf) MACRO(OPENEXR_FIND libname) OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY ${libname}) OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY_DEBUG ${libname}d) ENDMACRO(OPENEXR_FIND) -OPENEXR_FIND(IlmIlf) +OPENEXR_FIND(IlmImf) OPENEXR_FIND(IlmThread) OPENEXR_FIND(Iex) OPENEXR_FIND(Half) SET(OPENEXR_FOUND "NO") -IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmIlf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY) - SET(OPENEXR_LIBRARIES ${OPENEXR_IlmIlf_LIBRARY} ${OPENEXR_IlmThread_LIBRARY} ${OPENEXR_Half_LIBRARY} ${OPENEXR_Iex_LIBRARY} ) - SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmIlf_LIBRARY OPENEXR_IlmThread_LIBRARY OPENEXR_Half_LIBRARY OPENEXR_Iex_LIBRARY ) +IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY) + SET(OPENEXR_LIBRARIES ${OPENEXR_IlmImf_LIBRARY} ${OPENEXR_IlmThread_LIBRARY} ${OPENEXR_Half_LIBRARY} ${OPENEXR_Iex_LIBRARY} ) + SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmImf_LIBRARY OPENEXR_IlmThread_LIBRARY OPENEXR_Half_LIBRARY OPENEXR_Iex_LIBRARY ) SET(OPENEXR_FOUND "YES") -ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmIlf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY) +ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY)