Cycles OSL: windows build system changes to support static OSL/OIIO.
This commit is contained in:
@@ -621,11 +621,11 @@ elseif(WIN32)
|
||||
)
|
||||
|
||||
if(WITH_OPENIMAGEIO)
|
||||
if(NOT MINGW)
|
||||
set(OIIOBIN ${LIBDIR}/openimageio/bin)
|
||||
set(OIIODLL ${LIBDIR}/openimageio/bin/OpenImageIO.dll)
|
||||
if(NOT MINGW AND EXISTS ${OIIODLL})
|
||||
install(
|
||||
FILES
|
||||
${OIIOBIN}/OpenImageIO.dll
|
||||
${OIIODLL}
|
||||
DESTINATION ${TARGETDIR}
|
||||
)
|
||||
endif()
|
||||
@@ -648,20 +648,6 @@ elseif(WIN32)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(WITH_CYCLES AND WITH_CYCLES_OSL)
|
||||
if(NOT MINGW)
|
||||
set(OSLBIN ${LIBDIR}/osl/bin)
|
||||
install(
|
||||
FILES
|
||||
${OSLBIN}/oslexec.dll
|
||||
${OSLBIN}/oslquery.dll
|
||||
${OSLBIN}/oslcomp.dll
|
||||
DESTINATION ${TARGETDIR}
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
elseif(APPLE)
|
||||
|
||||
# handy install macro to exclude files, we use \$ escape for the "to"
|
||||
|
Reference in New Issue
Block a user