[Bf-blender-cvs] [f430685d2d2] master: Windows: Fix compatibility with older cmake

Ray Molenkamp noreply at git.blender.org
Fri Aug 30 19:40:51 CEST 2019


Commit: f430685d2d286f2f43b68ea2debec4f124de9072
Author: Ray Molenkamp
Date:   Fri Aug 30 11:40:46 2019 -0600
Branches: master
https://developer.blender.org/rBf430685d2d286f2f43b68ea2debec4f124de9072

Windows: Fix compatibility with older cmake

Older cmake did not find the BlendThumb sub project.

===================================================================

M	source/blender/blendthumb/CMakeLists.txt
M	source/creator/CMakeLists.txt

===================================================================

diff --git a/source/blender/blendthumb/CMakeLists.txt b/source/blender/blendthumb/CMakeLists.txt
index 3f9e0b1bff5..669234550af 100644
--- a/source/blender/blendthumb/CMakeLists.txt
+++ b/source/blender/blendthumb/CMakeLists.txt
@@ -30,3 +30,9 @@ set(SRC
 
 add_library(BlendThumb SHARED ${SRC})
 target_link_libraries(BlendThumb ${ZLIB_LIBRARIES})
+
+install(
+    FILES $<TARGET_FILE:BlendThumb>
+    COMPONENT Blender
+    DESTINATION "."
+)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 893d3262590..1cd0a6661f8 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1025,16 +1025,6 @@ if (WIN32)
   set_target_properties(blender PROPERTIES VS_GLOBAL_VcpkgEnabled "false")
 endif()
 
-# -----------------------------------------------------------------------------
-# Thumbnailer
-if(WIN32)
-  install(
-    TARGETS BlendThumb
-    COMPONENT Blender
-    DESTINATION "."
-  )
-endif()
-
 # -----------------------------------------------------------------------------
 # Setup launcher



More information about the Bf-blender-cvs mailing list