diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-08-28 04:37:55 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-08-28 04:38:31 +0300 |
| commit | 5e8a030a08b73a1fbd94ed11dcc51d26f1c27dad (patch) | |
| tree | e3b803f98ea30bc97a70267fb736cea6d2cbe699 /source/creator | |
| parent | 6dd394bf02b121a61fb8bdf153b778330a3d9320 (diff) | |
cmake: adjustments required for lib-upgrade on windows.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index d4246d9d705..e6772a003f5 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -717,7 +717,7 @@ elseif(WIN32) ) if(WITH_PYTHON_INSTALL_NUMPY) - set(PYTHON_NUMPY_VERSION 1.13) + set(PYTHON_NUMPY_VERSION 1.15) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages) @@ -780,12 +780,12 @@ elseif(WIN32) if(WITH_CODEC_FFMPEG) install( FILES - ${LIBDIR}/ffmpeg/lib/avcodec-57.dll - ${LIBDIR}/ffmpeg/lib/avformat-57.dll - ${LIBDIR}/ffmpeg/lib/avdevice-57.dll - ${LIBDIR}/ffmpeg/lib/avutil-55.dll - ${LIBDIR}/ffmpeg/lib/swscale-4.dll - ${LIBDIR}/ffmpeg/lib/swresample-2.dll + ${LIBDIR}/ffmpeg/lib/avcodec-58.dll + ${LIBDIR}/ffmpeg/lib/avformat-58.dll + ${LIBDIR}/ffmpeg/lib/avdevice-58.dll + ${LIBDIR}/ffmpeg/lib/avutil-56.dll + ${LIBDIR}/ffmpeg/lib/swscale-5.dll + ${LIBDIR}/ffmpeg/lib/swresample-3.dll DESTINATION "." ) endif() @@ -834,15 +834,6 @@ elseif(WIN32) DESTINATION "." ) - if(WITH_OPENCOLORIO) - set(OCIOBIN ${LIBDIR}/opencolorio/bin) - install( - FILES - ${OCIOBIN}/OpenColorIO.dll - DESTINATION "." - ) - endif() - elseif(APPLE) # handy install macro to exclude files, we use \$ escape for the "to" |