Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CamiTK
CamiTK Community Edition
Commits
928f9c06
Commit
928f9c06
authored
Dec 26, 2017
by
Emmanuel Promayon
Browse files
Merge branch 'bug/continuous-script-githash' into 'develop'
FIXED unset variable before setting them again See merge request
!17
parents
c7fb3a99
d1581592
Changes
1
Hide whitespace changes
Inline
Side-by-side
sdk/cmake/modules/macros/GetGitInfo.cmake
View file @
928f9c06
...
...
@@ -12,36 +12,42 @@
#! \inparam PATH_TO_SOURCE_DIR (required) input source directory path
#!
macro
(
get_git_info PATH_TO_SOURCE_DIR
)
unset
(
CAMITK_GIT_COMMIT_COUNT
)
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
rev-list HEAD --count
WORKING_DIRECTORY
${
PATH_TO_SOURCE_DIR
}
OUTPUT_VARIABLE CAMITK_GIT_COMMIT_COUNT
OUTPUT_STRIP_TRAILING_WHITESPACE
)
unset
(
CAMITK_GIT_BRANCH
)
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
rev-parse --abbrev-ref HEAD
WORKING_DIRECTORY
${
PATH_TO_SOURCE_DIR
}
OUTPUT_VARIABLE CAMITK_GIT_BRANCH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
unset
(
CAMITK_GIT_ABBREVIATED_HASH
)
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
log -1 --format=%h
WORKING_DIRECTORY
${
PATH_TO_SOURCE_DIR
}
OUTPUT_VARIABLE CAMITK_GIT_ABBREVIATED_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
unset
(
CAMITK_GIT_HASH
)
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
log -1 --format=%H
WORKING_DIRECTORY
${
PATH_TO_SOURCE_DIR
}
OUTPUT_VARIABLE CAMITK_GIT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
unset
(
CAMITK_GIT_COMMITER_DATE
)
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
log -1 --format=%cd
WORKING_DIRECTORY
${
PATH_TO_SOURCE_DIR
}
OUTPUT_VARIABLE CAMITK_GIT_COMMITER_DATE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
unset
(
CAMITK_ORIGIN_DEVELOP_GIT_HASH
)
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
rev-parse origin/develop
WORKING_DIRECTORY
${
PATH_TO_SOURCE_DIR
}
OUTPUT_VARIABLE CAMITK_ORIGIN_DEVELOP_GIT_HASH
...
...
@@ -51,11 +57,13 @@ macro(get_git_info PATH_TO_SOURCE_DIR)
string
(
SUBSTRING
${
CAMITK_ORIGIN_DEVELOP_GIT_HASH
}
0 8 CAMITK_ORIGIN_DEVELOP_GIT_ABBREVIATED_HASH
)
if
(
NOT CAMITK_GIT_COMMIT_COUNT
)
message
(
WARNING
"Unable to find the commit number using git :
${
GIT_EXECUTABLE
}
"
)
set
(
CAMITK_GIT_COMMIT_COUNT
"unknown"
)
set
(
CAMITK_GIT_BRANCH
"unknown"
)
set
(
CAMITK_GIT_HASH
"unknown"
)
set
(
CAMITK_GIT_ABBREVIATED_HASH
"unknown"
)
message
(
WARNING
"Unable to find the commit number using git :
${
GIT_EXECUTABLE
}
"
)
set
(
CAMITK_GIT_COMMIT_COUNT
"unknown"
)
set
(
CAMITK_GIT_BRANCH
"unknown"
)
set
(
CAMITK_GIT_HASH
"unknown"
)
set
(
CAMITK_GIT_ABBREVIATED_HASH
"unknown"
)
set
(
CAMITK_ORIGIN_DEVELOP_GIT_HASH
"unknown"
)
set
(
CAMITK_ORIGIN_DEVELOP_GIT_ABBREVIATED_HASH
"unknown"
)
endif
()
endmacro
()
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