Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Testicular Slingshot
Alchemy Viewer
Commits
684623bd
Commit
684623bd
authored
Jan 04, 2020
by
Rye Mutt
🍞
Browse files
Fix small build bug in version number generation
parent
e6a9f965
Changes
1
Hide whitespace changes
Inline
Side-by-side
indra/cmake/BuildVersion.cmake
View file @
684623bd
...
...
@@ -14,10 +14,10 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n
string
(
REGEX REPLACE
"^[0-9]+
\\
.([0-9]+)
\\
.[0-9]+"
"
\\
1"
VIEWER_VERSION_MINOR
${
VIEWER_SHORT_VERSION
}
)
string
(
REGEX REPLACE
"^[0-9]+
\\
.[0-9]+
\\
.([0-9]+)"
"
\\
1"
VIEWER_VERSION_PATCH
${
VIEWER_SHORT_VERSION
}
)
if
((
NOT REVISION_FROM_
HG
)
AND DEFINED ENV{revision}
)
if
((
NOT REVISION_FROM_
VCS
)
AND DEFINED ENV{revision}
)
set
(
VIEWER_VERSION_REVISION $ENV{revision}
)
message
(
STATUS
"Revision (from environment):
${
VIEWER_VERSION_REVISION
}
"
)
elseif
((
NOT REVISION_FROM_
HG
)
AND DEFINED ENV{AUTOBUILD_BUILD_ID}
)
elseif
((
NOT REVISION_FROM_
VCS
)
AND DEFINED ENV{AUTOBUILD_BUILD_ID}
)
set
(
VIEWER_VERSION_REVISION $ENV{AUTOBUILD_BUILD_ID}
)
message
(
STATUS
"Revision (from autobuild environment):
${
VIEWER_VERSION_REVISION
}
"
)
elseif
(
Git_FOUND
)
...
...
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