diff options
author | Sebastian Parborg <darkdefende@gmail.com> | 2021-10-28 22:20:25 +0300 |
---|---|---|
committer | Sebastian Parborg <darkdefende@gmail.com> | 2021-10-28 22:20:25 +0300 |
commit | a6af0e570d0e134c6ebb016801309bfce2c32f67 (patch) | |
tree | 9f870a2ddf1f1ff24c2d307e5c8ba4a461c4c462 /source | |
parent | ec9357a94ed41b5972733df7f04220c0883cc8e1 (diff) | |
parent | 690300eb4acd01ecada000c5ce6162c2437f9f6b (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blendthumb/CMakeLists.txt | 11 | ||||
-rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/winstuff.c | 2 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 7 |
4 files changed, 13 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() diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 72087a12767..7db984aef5c 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -367,6 +367,10 @@ if(WITH_GMP) endif() if(WIN32) + if (WITH_BLENDER_THUMBNAILER) + # Needed for querying the thumbnailer .dll in winstuff.c + add_definitions(-DWITH_BLENDER_THUMBNAILER) + endif() list(APPEND INC ../../../intern/utfconv ) diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c index d5c9c5cd5e6..3001b25bc1e 100644 --- a/source/blender/blenlib/intern/winstuff.c +++ b/source/blender/blenlib/intern/winstuff.c @@ -172,12 +172,14 @@ bool BLI_windows_register_blend_extension(const bool background) return false; } +# ifdef WITH_BLENDER_THUMBNAILER BLI_windows_get_executable_dir(InstallDir); GetSystemDirectory(SysDir, FILE_MAXDIR); ThumbHandlerDLL = "BlendThumb.dll"; snprintf( RegCmd, MAX_PATH * 2, "%s\\regsvr32 /s \"%s\\%s\"", SysDir, InstallDir, ThumbHandlerDLL); system(RegCmd); +# endif RegCloseKey(root); printf("success (%s)\n", usr_mode ? "user" : "system"); diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index de560e39606..816d3a60fc3 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -990,6 +990,13 @@ elseif(WIN32) DESTINATION "." ) + if(WITH_BLENDER_THUMBNAILER) + install( + TARGETS BlendThumb + DESTINATION "." + ) + endif() + if(WITH_DRACO) install( PROGRAMS $<TARGET_FILE:extern_draco> |