Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Parborg <darkdefende@gmail.com>2021-10-28 22:03:47 +0300
committerSebastian Parborg <darkdefende@gmail.com>2021-10-28 22:13:47 +0300
commit690300eb4acd01ecada000c5ce6162c2437f9f6b (patch)
tree66081a38155050b9530c9fb59422c4336fc0ea91 /source/blender/blendthumb
parentdb8be0cdfbaf9346af931a56da8df92f84845db3 (diff)
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
Diffstat (limited to 'source/blender/blendthumb')
-rw-r--r--source/blender/blendthumb/CMakeLists.txt11
1 files changed, 0 insertions, 11 deletions
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 $<TARGET_FILE:BlendThumb>
- 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 $<TARGET_FILE:blender-thumbnailer>
- COMPONENT Blender
- DESTINATION "."
- )
endif()