From 8e5cd99e0b9b1b19f8b24100ca0f5b886069b780 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sun, 16 Jun 2013 18:59:50 +0000 Subject: Fix for building Blender with OSL, and no OpenEXR headers in standard paths (like /usr/include/OpenEXR). As OSL headers mix #include and #include , we need both /path/to/openexr/include and /path/to/openexr/include/OpenEXR include paths... :/ Issue investigated by doug65536 on IRC, thanks. --- build_files/cmake/Modules/FindOpenEXR.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'build_files/cmake/Modules/FindOpenEXR.cmake') diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake index 9f1d6571ef5..9ea0f6c9efd 100644 --- a/build_files/cmake/Modules/FindOpenEXR.cmake +++ b/build_files/cmake/Modules/FindOpenEXR.cmake @@ -52,11 +52,11 @@ SET(_openexr_SEARCH_DIRS 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 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG 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 and #include :( + SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR) ENDIF() MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR) -- cgit v1.2.3