[Bf-blender-cvs] [ae755c01676] master: Windows: Fill ProductVersion of blender executable

Laurent Noel noreply at git.blender.org
Wed Sep 25 20:06:28 CEST 2019


Commit: ae755c0167652ad95900d880c3e85a20e7bdc8b3
Author: Laurent Noel
Date:   Wed Sep 25 12:06:20 2019 -0600
Branches: master
https://developer.blender.org/rBae755c0167652ad95900d880c3e85a20e7bdc8b3

Windows: Fill ProductVersion of blender executable

On windows, the ProductVersion field of the blender executable was empty,
see [1] for more information. This field might be required by windows
tools such as SCCM agent to track usage statistics.

It seems that it was due to the BLEN_VER_RC_STR macro used in
winblender.rc not being a string.

[1] https://docs.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource

Differential Revision: https://developer.blender.org/D5896

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

M	source/creator/CMakeLists.txt

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

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index e1326d62ae0..85b6f24a269 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -133,7 +133,7 @@ if(WIN32 AND NOT UNIX)
   string(SUBSTRING ${BLENDER_VERSION} 2 1 bver2)
   string(SUBSTRING ${BLENDER_VERSION} 3 1 bver3)
   add_definitions(
-    -DBLEN_VER_RC_STR=${BLENDER_VERSION}
+    -DBLEN_VER_RC_STR="${BLENDER_VERSION}"
     -DBLEN_VER_RC_1=${bver1}
     -DBLEN_VER_RC_2=${bver2}
     -DBLEN_VER_RC_3=${bver3}



More information about the Bf-blender-cvs mailing list