From 690300eb4acd01ecada000c5ce6162c2437f9f6b Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Thu, 28 Oct 2021 21:03:47 +0200 Subject: Fix install paths for blender thumbnailer when not building a portable install When doing a non portable build of blender, the executable blender-thumbnailer would be installed in two locations: /usr/bin/ /usr/ While cleaning up, also make the blender thumbnailer dll optional on windows to bring the logic in line with what it is on linux and mac. Reviewed By: Campbell Barton, Ray molenkamp Differential Revision: http://developer.blender.org/D13014 --- source/blender/blendthumb/CMakeLists.txt | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'source/blender/blendthumb') diff --git a/source/blender/blendthumb/CMakeLists.txt b/source/blender/blendthumb/CMakeLists.txt index 4bcd27082c0..4c2e72418a0 100644 --- a/source/blender/blendthumb/CMakeLists.txt +++ b/source/blender/blendthumb/CMakeLists.txt @@ -56,11 +56,6 @@ if(WIN32) target_link_libraries(BlendThumb bf_blenlib dbghelp.lib Version.lib) set_target_properties(BlendThumb PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt") - install( - FILES $ - COMPONENT Blender - DESTINATION "." - ) else() # ----------------------------------------------------------------------------- # Build `blender-thumbnailer` executable @@ -68,10 +63,4 @@ else() add_executable(blender-thumbnailer ${SRC} src/blender_thumbnailer.cc) target_link_libraries(blender-thumbnailer bf_blenlib) target_link_libraries(blender-thumbnailer ${PTHREADS_LIBRARIES}) - - install( - FILES $ - COMPONENT Blender - DESTINATION "." - ) endif() -- cgit v1.2.3