diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-05-12 11:46:16 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-05-12 22:50:49 +0300 |
| commit | 80953aed333051f7d2b319e3e087add7a2800956 (patch) | |
| tree | 420b0c26e34636008393dfaa7039f3b2a0f58e60 /build_files | |
| parent | 122a3169e22059c415dab90cd55c6a4a15490ec2 (diff) | |
Fix CMake using different OpenEXR / USD includes and libraries in some cases
Search for all potential library names in each directory, otherwise e.g.
libImath-2_2.a from a system directory will be preferred over libImath.a even
if we specified a directory.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/Modules/FindOpenEXR.cmake | 1 | ||||
| -rw-r--r-- | build_files/cmake/Modules/FindUSD.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake index 2038726863f..3cf559a5da1 100644 --- a/build_files/cmake/Modules/FindOpenEXR.cmake +++ b/build_files/cmake/Modules/FindOpenEXR.cmake @@ -104,6 +104,7 @@ FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS}) FIND_LIBRARY(OPENEXR_${UPPERCOMPONENT}_LIBRARY NAMES ${COMPONENT}-${_openexr_libs_ver} ${COMPONENT} + NAMES_PER_DIR HINTS ${_openexr_SEARCH_DIRS} PATH_SUFFIXES diff --git a/build_files/cmake/Modules/FindUSD.cmake b/build_files/cmake/Modules/FindUSD.cmake index 97830af1dd9..043a10ffa98 100644 --- a/build_files/cmake/Modules/FindUSD.cmake +++ b/build_files/cmake/Modules/FindUSD.cmake @@ -43,6 +43,7 @@ FIND_PATH(USD_INCLUDE_DIR FIND_LIBRARY(USD_LIBRARY NAMES usd_m usd_ms + NAMES_PER_DIR HINTS ${_usd_SEARCH_DIRS} PATH_SUFFIXES |