[Bf-blender-cvs] [b5b5260464f] master: Fix T54234, add BLENDER_VERSION_CHAR to .plist

[Arto Kitula]

Commit: b5b5260464fbba81610f26d4e04e5aedeef8cfd6
Author: Arto Kitula
Date:   Tue Mar 6 02:36:29 2018 +0200
Branches: master
https://developer.blender.org/rBb5b5260464fbba81610f26d4e04e5aedeef8cfd6

Fix T54234, add BLENDER_VERSION_CHAR to .plist

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

M       source/blenderplayer/CMakeLists.txt
M       source/creator/CMakeLists.txt

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

diff --git a/source/blenderplayer/CMakeLists.txt 
b/source/blenderplayer/CMakeLists.txt
index 25ae83d04cd..cec936f215d 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -58,8 +58,8 @@ elseif(APPLE)
        set(PLAYER_SOURCEINFO ${PLAYER_SOURCEDIR}/Contents/Info.plist)
        set_target_properties(blenderplayer PROPERTIES
                MACOSX_BUNDLE_INFO_PLIST ${PLAYER_SOURCEINFO}
-               MACOSX_BUNDLE_SHORT_VERSION_STRING ${BLENDER_VERSION}
-               MACOSX_BUNDLE_LONG_VERSION_STRING "${BLENDER_VERSION} 
${BLENDER_DATE}")
+               MACOSX_BUNDLE_SHORT_VERSION_STRING 
"${BLENDER_VERSION}${BLENDER_VERSION_CHAR}"
+               MACOSX_BUNDLE_LONG_VERSION_STRING 
"${BLENDER_VERSION}${BLENDER_VERSION_CHAR} ${BLENDER_DATE}")
 
 else()
        add_executable(blenderplayer bad_level_call_stubs/stubs.c)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index bcb0a7a7d1d..a155f060335 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -864,8 +864,8 @@ elseif(APPLE)
 
        set_target_properties(blender PROPERTIES
                MACOSX_BUNDLE_INFO_PLIST 
${OSX_APP_SOURCEDIR}/Contents/Info.plist
-               MACOSX_BUNDLE_SHORT_VERSION_STRING ${BLENDER_VERSION}
-               MACOSX_BUNDLE_LONG_VERSION_STRING "${BLENDER_VERSION} 
${BLENDER_DATE}")
+               MACOSX_BUNDLE_SHORT_VERSION_STRING 
"${BLENDER_VERSION}${BLENDER_VERSION_CHAR}"
+               MACOSX_BUNDLE_LONG_VERSION_STRING 
"${BLENDER_VERSION}${BLENDER_VERSION_CHAR} ${BLENDER_DATE}")
 
        # Gather the date in finder-style
        execute_process(COMMAND date "+%m/%d/%Y/%H:%M"

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs