Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 19 Dec 2018 11:58:22 +0000 (12:58 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 19 Dec 2018 11:58:22 +0000 (12:58 +0100)
build_files/cmake/buildinfo.cmake
build_files/cmake/packaging.cmake

index a43b99f..12bbf49 100644 (file)
@@ -22,7 +22,7 @@ if(EXISTS ${SOURCE_DIR}/.git)
        if(MY_WC_BRANCH STREQUAL "HEAD")
                # Detached HEAD, check whether commit hash is reachable
                # in the master branch
-               execute_process(COMMAND git rev-parse --short HEAD
+               execute_process(COMMAND git rev-parse --short=12 HEAD
                                WORKING_DIRECTORY ${SOURCE_DIR}
                                OUTPUT_VARIABLE MY_WC_HASH
                                OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -80,12 +80,12 @@ if(EXISTS ${SOURCE_DIR}/.git)
                if(NOT _git_below_check STREQUAL "")
                        # If there're commits between HEAD and upstream this means
                        # that we're reset-ed to older revision. Use it's hash then.
-                       execute_process(COMMAND git rev-parse --short HEAD
+                       execute_process(COMMAND git rev-parse --short=12 HEAD
                                        WORKING_DIRECTORY ${SOURCE_DIR}
                                        OUTPUT_VARIABLE MY_WC_HASH
                                        OUTPUT_STRIP_TRAILING_WHITESPACE)
                else()
-                       execute_process(COMMAND git rev-parse --short @{u}
+                       execute_process(COMMAND git rev-parse --short=12 @{u}
                                        WORKING_DIRECTORY ${SOURCE_DIR}
                                        OUTPUT_VARIABLE MY_WC_HASH
                                        OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -94,7 +94,7 @@ if(EXISTS ${SOURCE_DIR}/.git)
                        if(MY_WC_HASH STREQUAL "")
                                # Local branch, not set to upstream.
                                # Well, let's use HEAD for now
-                               execute_process(COMMAND git rev-parse --short HEAD
+                               execute_process(COMMAND git rev-parse --short=12 HEAD
                                                WORKING_DIRECTORY ${SOURCE_DIR}
                                                OUTPUT_VARIABLE MY_WC_HASH
                                                OUTPUT_STRIP_TRAILING_WHITESPACE)
index 2408e4e..fb69a7c 100644 (file)
@@ -26,7 +26,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.git/)
        find_package(Git)
        if(GIT_FOUND)
                # message(STATUS "Found Git: ${GIT_EXECUTABLE}")
-               execute_process(COMMAND git rev-parse --short HEAD
+               execute_process(COMMAND git rev-parse --short=12 HEAD
                                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                                OUTPUT_VARIABLE MY_WC_HASH
                                OUTPUT_STRIP_TRAILING_WHITESPACE