Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build_files/cmake/Modules/FindOpenEXR.cmake7
1 files changed, 4 insertions, 3 deletions
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 <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)