[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57509] trunk/blender/build_files/cmake/ Modules/FindOpenEXR.cmake: Fix for building Blender with OSL, and no OpenEXR headers in standard paths (like /usr/include/OpenEXR).

[Bastien Montagne]

Revision: 57509
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57509
Author:   mont29
Date:     2013-06-16 18:59:50 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
Fix for building Blender with OSL, and no OpenEXR headers in standard paths (like /usr/include/OpenEXR).

As OSL headers mix #include <OpenEXR/foo.h> and #include <foo.h>, we need both /path/to/openexr/include and /path/to/openexr/include/OpenEXR include paths... :/

Issue investigated by doug65536 on IRC, thanks.

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	2013-06-16 17:07:07 UTC (rev 57508)
+++ trunk/blender/build_files/cmake/Modules/FindOpenEXR.cmake	2013-06-16 18:59:50 UTC (rev 57509)
@@ -52,11 +52,11 @@
 
 FIND_PATH(OPENEXR_INCLUDE_DIR
   NAMES
-    ImfXdr.h
+    OpenEXR/ImfXdr.h
   HINTS
     ${_openexr_SEARCH_DIRS}
   PATH_SUFFIXES
-    include/OpenEXR
+    include
 )
 
 SET(_openexr_LIBRARIES)
@@ -82,7 +82,8 @@
 
 IF(OPENEXR_FOUND)
   SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
-  SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR})
+  # Both include paths are needed because of dummy OSL headers mixing #include <OpenEXR/foo.h> and #include <foo.h> :(
+  SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
 ENDIF()
 
 MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR)