Cycles OSL: windows build system changes to support static OSL/OIIO.

This commit is contained in:
Brecht Van Lommel
2012-11-15 17:16:27 +00:00
parent 1c9b548d92
commit 2324c80f50
7 changed files with 26 additions and 26 deletions

View File

@@ -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"