[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37538] trunk/blender/build_files/cmake/ Modules/FindOpenEXR.cmake: fix to FindOpenEXR pointed out by Sergey Sharybin,
Campbell Barton
ideasman42 at gmail.com
Thu Jun 16 04:48:07 CEST 2011
Revision: 37538
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37538
Author: campbellbarton
Date: 2011-06-16 02:48:07 +0000 (Thu, 16 Jun 2011)
Log Message:
-----------
fix to FindOpenEXR pointed out by Sergey Sharybin,
also added check for IlmThread and marked individual library cache variables as advanced.
Modified Paths:
--------------
trunk/blender/build_files/cmake/Modules/FindOpenEXR.cmake
Modified: trunk/blender/build_files/cmake/Modules/FindOpenEXR.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindOpenEXR.cmake 2011-06-16 02:46:38 UTC (rev 37537)
+++ trunk/blender/build_files/cmake/Modules/FindOpenEXR.cmake 2011-06-16 02:48:07 UTC (rev 37538)
@@ -7,6 +7,14 @@
# OPENEXR_ROOT_DIR, The base directory to search for OpenEXR.
# This can also be an environment variable.
# 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
# OPENEXR_LIBRARY, where to find the OpenEXR library.
@@ -30,8 +38,9 @@
SET(_openexr_FIND_COMPONENTS
Half
+ Iex
IlmImf
- Iex
+ IlmThread
Imath
)
@@ -63,14 +72,15 @@
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
- ${_openexr_LIBRARIES} OPENEXR_INCLUDE_DIR)
+ _openexr_LIBRARIES OPENEXR_INCLUDE_DIR)
IF(OPENEXR_FOUND)
SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR})
ENDIF(OPENEXR_FOUND)
-MARK_AS_ADVANCED(
- ${_openexr_LIBRARIES}
- OPENEXR_INCLUDE_DIR
-)
+MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR)
+FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+ MARK_AS_ADVANCED(OPENEXR_${UPPERCOMPONENT}_LIBRARY)
+ENDFOREACH()
More information about the Bf-blender-cvs
mailing list