From 66ec72045f8c25ec9e9710f4d70aed9fb1514df6 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Fri, 30 Aug 2019 08:40:08 -0600 Subject: Windows: Move building of blendthumb into the blender codebase. Previously this was done in the deps builder due to the fact we needed both 32 and 64 bit versions of this dll and CMAKE does not support that in a single build folder. Now that 32 bit support has been dropped, this can be safely moved into the codebase. Reviewers: brecht Differential Revision: https://developer.blender.org/D5633 --- source/creator/CMakeLists.txt | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'source/creator') diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index f74fd57252d..893d3262590 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -820,18 +820,6 @@ elseif(WIN32) ) endif() - if(NOT CMAKE_CL_64) - install( - FILES ${LIBDIR}/thumbhandler/lib/BlendThumb.dll - DESTINATION "." - ) - endif() - - install( # x86 builds can run on x64 Windows, so this is required at all times - FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll - DESTINATION "." - ) - install( FILES ${CMAKE_SOURCE_DIR}/release/windows/batch/blender_debug_gpu.cmd @@ -1037,6 +1025,16 @@ if (WIN32) set_target_properties(blender PROPERTIES VS_GLOBAL_VcpkgEnabled "false") endif() +# ----------------------------------------------------------------------------- +# Thumbnailer +if(WIN32) + install( + TARGETS BlendThumb + COMPONENT Blender + DESTINATION "." + ) +endif() + # ----------------------------------------------------------------------------- # Setup launcher -- cgit v1.2.3