diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2021-04-16 04:17:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-04-16 04:23:34 +0300 |
| commit | 62bff15377510ce05543afb40526d430a21697f1 (patch) | |
| tree | 9c148d99f042ae0be4f4be9b0e62ddda84cd6860 /source/creator/CMakeLists.txt | |
| parent | ec241eb0d020e20924651490a5b74473e347091d (diff) | |
Fix various Blender 3.0 versioning issues
This changes the following items:
- package name is now `blender-3.0.0-git.09eb04c0a865-windows64`
rather than `blender-3.00.0-git.09eb04c0a865-windows64`
- Fix version resource for blender.exe not building
- Data directories are now `3.0\...` rather than `3.00\....`
- User prefs are now in:
`c:\Users\users\AppData\Roaming\Blender Foundation\Blender\3.0\`
rather than:
`c:\Users\users\AppData\Roaming\Blender Foundation\Blender\3.00\`
- Updating startup & preferences from previous release
has a special exception for 3.0 to check for 3.93 and older.
See T87532
Ref D10986
Diffstat (limited to 'source/creator/CMakeLists.txt')
| -rw-r--r-- | source/creator/CMakeLists.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index cb5fc538e69..f1741c3b495 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -130,14 +130,11 @@ set(SRC # MSVC 2010 gives linking errors with the manifest if(WIN32 AND NOT UNIX) - string(SUBSTRING ${BLENDER_VERSION} 0 1 bver1) - 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_1=${bver1} - -DBLEN_VER_RC_2=${bver2} - -DBLEN_VER_RC_3=${bver3} + -DBLEN_VER_RC_1=${BLENDER_VERSION_MAJOR} + -DBLEN_VER_RC_2=${BLENDER_VERSION_MINOR} + -DBLEN_VER_RC_3=${BLENDER_VERSION_PATCH} -DBLEN_VER_RC_4=0 ) |