diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2018-05-01 18:03:20 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2018-05-01 18:03:20 +0300 |
| commit | bbfee34e9e2a3d8e8572dd41b3601e783d35a675 (patch) | |
| tree | fbb36728165d9c4ea8b60e0cac340652dbc7e30d /build_files/cmake/Modules/FindOpenImageIO.cmake | |
| parent | ae7b67902191abb7e5aefbdcc20b84f050ec2b08 (diff) | |
| parent | 2e98524b58a53f0d546e5f1e7d549d2f45815055 (diff) | |
Merge remote-tracking branch 'origin/master' into uv_unwrapping_slim_algorithm
Diffstat (limited to 'build_files/cmake/Modules/FindOpenImageIO.cmake')
| -rw-r--r-- | build_files/cmake/Modules/FindOpenImageIO.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake index 789097dfd51..52b7856c79c 100644 --- a/build_files/cmake/Modules/FindOpenImageIO.cmake +++ b/build_files/cmake/Modules/FindOpenImageIO.cmake @@ -34,7 +34,6 @@ SET(_openimageio_SEARCH_DIRS /usr/local /sw # Fink /opt/local # DarwinPorts - /opt/csw # Blastwave /opt/lib/oiio ) @@ -60,7 +59,7 @@ FIND_FILE(OPENIMAGEIO_IDIFF NAMES idiff HINTS - ${OPENIMAGEIO_ROOT_DIR} + ${_openimageio_SEARCH_DIRS} PATH_SUFFIXES bin ) @@ -76,6 +75,8 @@ IF(OPENIMAGEIO_FOUND) SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR}) IF(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp) SET(OPENIMAGEIO_PUGIXML_FOUND TRUE) + ELSE() + SET(OPENIMAGEIO_PUGIXML_FOUND FALSE) ENDIF() ELSE() SET(OPENIMAGEIO_PUGIXML_FOUND FALSE) |