diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 16:03:36 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 16:03:36 +0400 |
| commit | 78a4e2461419f026d53e409cb75073ba5f47e1bb (patch) | |
| tree | 2847f536bee9b51a0d30f59baf6becc22a8acffd /source/creator | |
| parent | 81f5c9ed9b8193864f1c6160aed9eef9338f0d27 (diff) | |
| parent | bac6757ea0b1c873b8dd8221592ea95eed8d5bac (diff) | |
svn merge ^/trunk/blender -r43009:43033
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index ac21bf5b21f..65df7ed7321 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -437,15 +437,15 @@ elseif(WIN32) # ) if(WITH_PYTHON) - + set_lib_path(PYLIB "python/lib") install( - FILES ${LIBDIR}/python/lib/python32.dll + FILES ${PYLIB}/python32.dll DESTINATION ${TARGETDIR} CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel ) install( - FILES ${LIBDIR}/python/lib/python32_d.dll + FILES ${PYLIB}/python32_d.dll DESTINATION ${TARGETDIR} CONFIGURATIONS Debug ) @@ -558,9 +558,10 @@ elseif(WIN32) ) if(WITH_OPENIMAGEIO) + set_lib_path(OIIOBIN "openimageio/bin") install( FILES - ${LIBDIR}/openimageio/bin/OpenImageIO.dll + ${OIIOBIN}/OpenImageIO.dll DESTINATION ${TARGETDIR} ) endif() @@ -822,6 +823,7 @@ endif() bf_blenfont bf_intern_audaspace bf_intern_mikktspace + bf_intern_dualcon bf_intern_cycles cycles_render cycles_bvh |