diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-15 21:16:27 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-15 21:16:27 +0400 |
| commit | 2324c80f50f9cb95435b66ea370d38fd9617760b (patch) | |
| tree | e9fe125c911541a232ba868c138f8f44531af97c /source/creator | |
| parent | 1c9b548d92e8a76ac0a3c730bff5634d4628e971 (diff) | |
Cycles OSL: windows build system changes to support static OSL/OIIO.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index b61466e8fe2..4d1620a8bb8 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -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" |