Commit: e355d557f83b7925cdee3d05a14849adb19a259a
Author: Sergey Sharybin
Date:   Mon Jul 27 12:18:45 2015 +0200
Branches: master
https://developer.blender.org/rBe355d557f83b7925cdee3d05a14849adb19a259a

CPack: Use hash of the head for the file name

Upstream is not always configured ad might give empty results.

Ideally we need to re-use the same code as we use for buildinfo,
but it's also a bit of a question which exact hash we want to put
to the name by default.

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

M       build_files/cmake/packaging.cmake

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

diff --git a/build_files/cmake/packaging.cmake 
b/build_files/cmake/packaging.cmake
index 0cb13e0..b2b14a5 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -24,7 +24,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.git/)
        include(FindGit)
        if(GIT_FOUND)
                message(STATUS "-- Found Git: ${GIT_EXECUTABLE}")
-               execute_process(COMMAND git rev-parse --short @{u}
+               execute_process(COMMAND git rev-parse --short HEAD
                                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                                OUTPUT_VARIABLE MY_WC_HASH
                                OUTPUT_STRIP_TRAILING_WHITESPACE

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to