Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Main Repositories
otb
Commits
8bce69d5
Commit
8bce69d5
authored
Jul 05, 2016
by
Julien Michel
Browse files
Merge branch 'develop' of
https://git.orfeo-toolbox.org/git/otb
into develop
parents
1e2a03fc
a7ea5de7
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMake/SourceStatus.cmake
View file @
8bce69d5
...
...
@@ -28,6 +28,16 @@ if(EXISTS "${PROJECT_SOURCE_DIR}/.git")
OUTPUT_VARIABLE OTB_GIT_LAST_COMMIT
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET
)
#git symbolic-ref --short -q HEAD does not work on older git version
#rather than checking for git version. it is better to not use that
#option and employ cmake stuff to do the work
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
symbolic-ref -q HEAD
WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
OUTPUT_VARIABLE OTB_GIT_SYMBOLIC_REF_OUTPUT
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET
)
get_filename_component
(
OTB_GIT_BRANCH
${
OTB_GIT_SYMBOLIC_REF_OUTPUT
}
NAME
)
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
log -1 --pretty=format:%H
WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
OUTPUT_VARIABLE OTB_WC_REVISION
...
...
CMakeLists.txt
View file @
8bce69d5
...
...
@@ -385,10 +385,8 @@ endmacro()
message
(
"
\n
======================= Begin of OTB cmake summary =======================
\n
"
)
if
(
OTB_GIT_LAST_COMMIT
)
get_white_spaces
(
"git log -1 --oneline"
insert_sp
)
message
(
"git log -1 --oneline = [
${
OTB_GIT_LAST_COMMIT
}
]"
)
endif
()
message
(
"git log -1 --oneline = [
${
OTB_GIT_LAST_COMMIT
}
]"
)
message
(
"git symbolic-ref -q HEAD =
${
OTB_GIT_BRANCH
}
"
)
set
(
option_list
${
OTB_MODULE_ACTIVATION_OPTION_LIST
}
)
list
(
SORT option_list
)
...
...
Write
Preview
Supports
Markdown
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