diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-06-28 18:37:08 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-06-28 18:37:08 +0400 |
| commit | 6b2e35c8b7474eeae92551060b05036658cc1837 (patch) | |
| tree | ba70dc458f78515bbb16f30af6cef8cb6995a40b /intern/cycles/cmake | |
| parent | f351e3572d163f0ae01d90f72789c49d3352e28b (diff) | |
Cycles: cmake tweak to make specifying OSL/OIIO path simpler.
Diffstat (limited to 'intern/cycles/cmake')
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index fbda3ac2e34..c3a9e00ca10 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -35,9 +35,9 @@ ENDIF() ########################################################################### # OpenImageIO -FIND_LIBRARY(OPENIMAGEIO_LIBRARY NAMES OpenImageIO PATHS ${CYCLES_OIIO}/lib) -FIND_PATH(OPENIMAGEIO_INCLUDES OpenImageIO/imageio.h ${CYCLES_OIIO}/include) -FIND_PROGRAM(OPENIMAGEIO_IDIFF NAMES idiff PATHS ${CYCLES_OIIO}/bin) +FIND_LIBRARY(OPENIMAGEIO_LIBRARY NAMES OpenImageIO PATHS ${CYCLES_OIIO}/lib ${CYCLES_OIIO}/dist) +FIND_PATH(OPENIMAGEIO_INCLUDES OpenImageIO/imageio.h ${CYCLES_OIIO}/include ${CYCLES_OIIO}/dist) +FIND_PROGRAM(OPENIMAGEIO_IDIFF NAMES idiff PATHS ${CYCLES_OIIO}/bin ${CYCLES_OIIO}/dist) IF(OPENIMAGEIO_INCLUDES AND OPENIMAGEIO_LIBRARY) SET(OPENIMAGEIO_FOUND TRUE) @@ -75,9 +75,9 @@ IF(WITH_CYCLES_OSL) MESSAGE(STATUS "CYCLES_OSL = ${CYCLES_OSL}") - FIND_LIBRARY(OSL_LIBRARIES NAMES oslexec oslcomp oslquery PATHS ${CYCLES_OSL}/lib) - FIND_PATH(OSL_INCLUDES OSL/oslclosure.h ${CYCLES_OSL}/include) - FIND_PROGRAM(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin) + FIND_LIBRARY(OSL_LIBRARIES NAMES oslexec oslcomp oslquery PATHS ${CYCLES_OSL}/lib ${CYCLES_OSL}/dist) + FIND_PATH(OSL_INCLUDES OSL/oslclosure.h ${CYCLES_OSL}/include ${CYCLES_OSL}/dist) + FIND_PROGRAM(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin ${CYCLES_OSL}/dist) IF(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER) SET(OSL_FOUND TRUE) |