forked from bartvdbraak/blender
Cycles: attempt to fix OIIO include path on windows.
This commit is contained in:
parent
5e2c5eaa5d
commit
ba36215669
@ -36,7 +36,7 @@ ENDIF()
|
|||||||
# OpenImageIO
|
# OpenImageIO
|
||||||
|
|
||||||
FIND_LIBRARY(OPENIMAGEIO_LIBRARY NAMES OpenImageIO PATHS ${CYCLES_OIIO}/lib ${CYCLES_OIIO}/dist)
|
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_PATH(OPENIMAGEIO_INCLUDES OpenImageIO/imageio.h PATHS ${CYCLES_OIIO}/include ${CYCLES_OIIO}/dist)
|
||||||
FIND_PROGRAM(OPENIMAGEIO_IDIFF NAMES idiff PATHS ${CYCLES_OIIO}/bin ${CYCLES_OIIO}/dist)
|
FIND_PROGRAM(OPENIMAGEIO_IDIFF NAMES idiff PATHS ${CYCLES_OIIO}/bin ${CYCLES_OIIO}/dist)
|
||||||
|
|
||||||
IF(OPENIMAGEIO_INCLUDES AND OPENIMAGEIO_LIBRARY)
|
IF(OPENIMAGEIO_INCLUDES AND OPENIMAGEIO_LIBRARY)
|
||||||
@ -76,7 +76,7 @@ IF(WITH_CYCLES_OSL)
|
|||||||
MESSAGE(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
|
MESSAGE(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
|
||||||
|
|
||||||
FIND_LIBRARY(OSL_LIBRARIES NAMES oslexec oslcomp oslquery PATHS ${CYCLES_OSL}/lib ${CYCLES_OSL}/dist)
|
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_PATH(OSL_INCLUDES OSL/oslclosure.h PATHS ${CYCLES_OSL}/include ${CYCLES_OSL}/dist)
|
||||||
FIND_PROGRAM(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin ${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)
|
IF(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
|
||||||
|
Loading…
Reference in New Issue
Block a user