diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-14 21:18:47 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-14 21:18:47 +0400 |
| commit | 71389d4d74fd1e632ff0e23416d33ca5e63c609d (patch) | |
| tree | 06412866e89a439ce9944738bdc1d12fb8b38ad0 /source/creator | |
| parent | 8c6350f9262581fe405020449f6a8d06a2a9aaa0 (diff) | |
Cycles OSL: windows build fixes.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 9087d106f96..b61466e8fe2 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -622,10 +622,10 @@ elseif(WIN32) if(WITH_OPENIMAGEIO) if(NOT MINGW) - set(OIIOBIN ${LIBDIR}/openimageio) + set(OIIOBIN ${LIBDIR}/openimageio/bin) install( FILES - ${OIIOBIN}/bin/OpenImageIO.dll + ${OIIOBIN}/OpenImageIO.dll DESTINATION ${TARGETDIR} ) endif() @@ -648,6 +648,20 @@ 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" |