Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Krita
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ashwin Dhakaita
Krita
Commits
8b18187e
Commit
8b18187e
authored
Dec 28, 2017
by
Alvin Wong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CMake: Use `git rev-parse HEAD` to get commit hash
parent
8ca5abd4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
5 deletions
+43
-5
CMakeLists.txt
CMakeLists.txt
+9
-5
cmake/modules/GetGitRevisionDescription.cmake
cmake/modules/GetGitRevisionDescription.cmake
+27
-0
libs/version/kritagitversion.h.cmake
libs/version/kritagitversion.h.cmake
+7
-0
No files found.
CMakeLists.txt
View file @
8b18187e
...
...
@@ -112,13 +112,17 @@ set(KRITA_GIT_SHA1_STRING "")
set
(
KRITA_GIT_BRANCH_STRING
""
)
include
(
GetGitRevisionDescription
)
get_git_head_
revision
(
GIT_REFSPEC
GIT_SHA1
)
get_git_head_
hash
(
GIT_SHA1
)
get_git_branch
(
GIT_BRANCH
)
if
(
GIT_SHA1 AND GIT_BRANCH
)
string
(
SUBSTRING
${
GIT_SHA1
}
0 7 GIT_SHA1
)
set
(
KRITA_GIT_SHA1_STRING
${
GIT_SHA1
}
)
set
(
KRITA_GIT_BRANCH_STRING
${
GIT_BRANCH
}
)
if
(
GIT_SHA1
)
string
(
SUBSTRING
${
GIT_SHA1
}
0 7 GIT_SHA1
)
set
(
KRITA_GIT_SHA1_STRING
${
GIT_SHA1
}
)
if
(
GIT_BRANCH
)
set
(
KRITA_GIT_BRANCH_STRING
${
GIT_BRANCH
}
)
else
()
set
(
KRITA_GIT_BRANCH_STRING
"(detached HEAD)"
)
endif
()
endif
()
if
(
NOT DEFINED RELEASE_BUILD
)
...
...
cmake/modules/GetGitRevisionDescription.cmake
View file @
8b18187e
...
...
@@ -128,6 +128,33 @@ function(git_describe _var)
set
(
${
_var
}
"
${
out
}
"
PARENT_SCOPE
)
endfunction
()
function
(
get_git_head_hash _var
)
if
(
NOT GIT_FOUND
)
find_package
(
Git QUIET
)
endif
()
if
(
NOT GIT_FOUND
)
set
(
${
_var
}
"GIT-NOTFOUND"
PARENT_SCOPE
)
return
()
endif
()
execute_process
(
COMMAND
"
${
GIT_EXECUTABLE
}
"
rev-parse --verify HEAD
WORKING_DIRECTORY
"
${
CMAKE_SOURCE_DIR
}
"
RESULT_VARIABLE
res
OUTPUT_VARIABLE
out
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if
(
NOT res EQUAL 0
)
set
(
out
"
${
out
}
-
${
res
}
-NOTFOUND"
)
endif
()
set
(
${
_var
}
"
${
out
}
"
PARENT_SCOPE
)
endfunction
()
function
(
get_git_branch _var
)
if
(
NOT GIT_FOUND
)
find_package
(
Git QUIET
)
...
...
libs/version/kritagitversion.h.cmake
View file @
8b18187e
...
...
@@ -35,4 +35,11 @@
*/
#cmakedefine KRITA_GIT_BRANCH_STRING "@KRITA_GIT_BRANCH_STRING@"
/**
* @def KRITA_GIT_DESCRIBE_STRING
* @ingroup KritaMacros
* @brief Indicates the git describe string
*/
#cmakedefine KRITA_GIT_DESCRIBE_STRING "@KRITA_GIT_DESCRIBE_STRING@"
#endif /* __KRITA_GIT_VERSION_H */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment