[Bf-blender-cvs] [24bd2d0beac] blender-v3.4-release: Fix T98726: Include blender version number in windows shortcuts

Ray Molenkamp noreply at git.blender.org
Mon Nov 21 02:31:09 CET 2022


Commit: 24bd2d0beac429de03da7dbea5384ef5c01995e2
Author: Ray Molenkamp
Date:   Sun Nov 20 18:31:00 2022 -0700
Branches: blender-v3.4-release
https://developer.blender.org/rB24bd2d0beac429de03da7dbea5384ef5c01995e2

Fix T98726: Include blender version number in windows shortcuts

You can install several versions of blender side by side and all
of them will try to create a "Blender" shortcut, which if already
exists the msi installer throws a warning about.

This change adds the blender version number to the desktop and start
menu shortcuts, side steps the problem and it's easier to tell the
various blender versions apart.

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

M	build_files/cmake/packaging.cmake

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

diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
index f178317fc36..91d70e64b94 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -106,8 +106,8 @@ if(WIN32)
   set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:medium)
 endif()
 
-set(CPACK_PACKAGE_EXECUTABLES "blender-launcher" "Blender")
-set(CPACK_CREATE_DESKTOP_LINKS "blender-launcher" "Blender")
+set(CPACK_PACKAGE_EXECUTABLES "blender-launcher" "Blender ${MAJOR_VERSION}.${MINOR_VERSION}")
+set(CPACK_CREATE_DESKTOP_LINKS "blender-launcher" "Blender ${MAJOR_VERSION}.${MINOR_VERSION}")
 
 include(CPack)



More information about the Bf-blender-cvs mailing list