sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix to FindOpenEXR pointed out by Sergey Sharybin,

Browse Source 
also added check for IlmThread and marked individual library cache variables as advanced.
This commit is contained in:
Campbell Barton 2011-06-16 02:48:07 +00:00
parent 1c0a6c6468
commit 0575c05eb0
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build_files/cmake/Modules/FindOpenEXR.cmake
View File

@ -7,6 +7,14 @@
# OPENEXR_ROOT_DIR, The base directory to search for OpenEXR. # OPENEXR_ROOT_DIR, The base directory to search for OpenEXR.
# This can also be an environment variable. # This can also be an environment variable.
# OPENEXR_FOUND, If false, do not try to use OpenEXR. # OPENEXR_FOUND, If false, do not try to use OpenEXR.
#
# For indervidual library access these advanced settings are available
# OPENEXR_HALF_LIBRARY, Path to Half library
# OPENEXR_IEX_LIBRARY, Path to Half library
# OPENEXR_ILMIMF_LIBRARY, Path to Ilmimf library
# OPENEXR_ILMTHREAD_LIBRARY, Path to IlmThread library
# OPENEXR_IMATH_LIBRARY, Path to Imath library
#
# also defined, but not for general use are # also defined, but not for general use are
# OPENEXR_LIBRARY, where to find the OpenEXR library. # OPENEXR_LIBRARY, where to find the OpenEXR library.
@ -30,8 +38,9 @@ ENDIF()
SET(_openexr_FIND_COMPONENTS SET(_openexr_FIND_COMPONENTS
Half Half
IlmImf
Iex Iex
IlmImf
IlmThread
Imath Imath
) )
@ -63,14 +72,15 @@ ENDFOREACH()
# all listed variables are TRUE # all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
${_openexr_LIBRARIES} OPENEXR_INCLUDE_DIR) _openexr_LIBRARIES OPENEXR_INCLUDE_DIR)
IF(OPENEXR_FOUND) IF(OPENEXR_FOUND)
SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES}) SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}) SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR})
ENDIF(OPENEXR_FOUND) ENDIF(OPENEXR_FOUND)
MARK_AS_ADVANCED( MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR)
${_openexr_LIBRARIES} FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
OPENEXR_INCLUDE_DIR STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
) MARK_AS_ADVANCED(OPENEXR_${UPPERCOMPONENT}_LIBRARY)
ENDFOREACH()