error in last commit
authorCampbell Barton <ideasman42@gmail.com>
Wed, 25 Feb 2015 07:19:39 +0000 (18:19 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 25 Feb 2015 07:19:39 +0000 (18:19 +1100)
build_files/cmake/macros.cmake

index 220199bea38d2b3811c29f9f1f11fa660e4ed588..94a8aa2823fc7e352c35371505009ee647aae573 100644 (file)
@@ -1071,8 +1071,8 @@ function(get_blender_version)
 
        # output vars
        set(BLENDER_VERSION "${_out_version_major}.${_out_version_minor}" PARENT_SCOPE)
-       set(BLENDER_VERSION_MAJOR "${_out_subversion}" PARENT_SCOPE)
-       set(BLENDER_VERSION_MINOR "${_out_subversion}" PARENT_SCOPE)
+       set(BLENDER_VERSION_MAJOR "${_out_version_major}" PARENT_SCOPE)
+       set(BLENDER_VERSION_MINOR "${_out_version_minor}" PARENT_SCOPE)
        set(BLENDER_SUBVERSION "${_out_subversion}" PARENT_SCOPE)
        set(BLENDER_VERSION_CHAR "${_out_version_char}" PARENT_SCOPE)
        set(BLENDER_VERSION_CHAR_INDEX "${_out_version_char_index}" PARENT_SCOPE)