Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
97f11bc6
Commit
97f11bc6
authored
8 years ago
by
Oz Linden
Browse files
Options
Downloads
Patches
Plain Diff
move build number informative output to stdout
parent
1671de36
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/cmake/BuildVersion.cmake
+6
-6
6 additions, 6 deletions
indra/cmake/BuildVersion.cmake
with
6 additions
and
6 deletions
indra/cmake/BuildVersion.cmake
+
6
−
6
View file @
97f11bc6
...
@@ -12,7 +12,7 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n
...
@@ -12,7 +12,7 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n
if
(
DEFINED ENV{revision}
)
if
(
DEFINED ENV{revision}
)
set
(
VIEWER_VERSION_REVISION $ENV{revision}
)
set
(
VIEWER_VERSION_REVISION $ENV{revision}
)
message
(
"Revision (from environment):
${
VIEWER_VERSION_REVISION
}
"
)
message
(
STATUS
"Revision (from environment):
${
VIEWER_VERSION_REVISION
}
"
)
else
(
DEFINED ENV{revision}
)
else
(
DEFINED ENV{revision}
)
find_program
(
MERCURIAL
find_program
(
MERCURIAL
...
@@ -33,23 +33,23 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n
...
@@ -33,23 +33,23 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n
string
(
REGEX REPLACE
"[^0-9a-f]"
""
VIEWER_VERSION_REVISION
${
VIEWER_VERSION_REVISION
}
)
string
(
REGEX REPLACE
"[^0-9a-f]"
""
VIEWER_VERSION_REVISION
${
VIEWER_VERSION_REVISION
}
)
endif
(
NOT
${
hg_id_result
}
EQUAL 0
)
endif
(
NOT
${
hg_id_result
}
EQUAL 0
)
if
(
"
${
VIEWER_VERSION_REVISION
}
"
MATCHES
"^[0-9]+$"
)
if
(
"
${
VIEWER_VERSION_REVISION
}
"
MATCHES
"^[0-9]+$"
)
message
(
"Revision (from hg)
${
VIEWER_VERSION_REVISION
}
"
)
message
(
STATUS
"Revision (from hg)
${
VIEWER_VERSION_REVISION
}
"
)
else
(
"
${
VIEWER_VERSION_REVISION
}
"
MATCHES
"^[0-9]+$"
)
else
(
"
${
VIEWER_VERSION_REVISION
}
"
MATCHES
"^[0-9]+$"
)
message
(
"Revision not set (repository not found?); using 0"
)
message
(
STATUS
"Revision not set (repository not found?); using 0"
)
set
(
VIEWER_VERSION_REVISION 0
)
set
(
VIEWER_VERSION_REVISION 0
)
endif
(
"
${
VIEWER_VERSION_REVISION
}
"
MATCHES
"^[0-9]+$"
)
endif
(
"
${
VIEWER_VERSION_REVISION
}
"
MATCHES
"^[0-9]+$"
)
else
(
MERCURIAL
)
else
(
MERCURIAL
)
message
(
"Revision not set: mercurial not found; using 0"
)
message
(
STATUS
"Revision not set: mercurial not found; using 0"
)
set
(
VIEWER_VERSION_REVISION 0
)
set
(
VIEWER_VERSION_REVISION 0
)
endif
(
MERCURIAL
)
endif
(
MERCURIAL
)
endif
(
DEFINED ENV{revision}
)
endif
(
DEFINED ENV{revision}
)
message
(
"Building '
${
VIEWER_CHANNEL
}
' Version
${
VIEWER_SHORT_VERSION
}
.
${
VIEWER_VERSION_REVISION
}
"
)
message
(
STATUS
"Building '
${
VIEWER_CHANNEL
}
' Version
${
VIEWER_SHORT_VERSION
}
.
${
VIEWER_VERSION_REVISION
}
"
)
else
(
EXISTS
${
VIEWER_VERSION_BASE_FILE
}
)
else
(
EXISTS
${
VIEWER_VERSION_BASE_FILE
}
)
message
(
SEND_ERROR
"Cannot get viewer version from '
${
VIEWER_VERSION_BASE_FILE
}
'"
)
message
(
SEND_ERROR
"Cannot get viewer version from '
${
VIEWER_VERSION_BASE_FILE
}
'"
)
endif
(
EXISTS
${
VIEWER_VERSION_BASE_FILE
}
)
endif
(
EXISTS
${
VIEWER_VERSION_BASE_FILE
}
)
if
(
"
${
VIEWER_VERSION_REVISION
}
"
STREQUAL
""
)
if
(
"
${
VIEWER_VERSION_REVISION
}
"
STREQUAL
""
)
message
(
"Ultimate fallback, revision was blank or not set: will use 0"
)
message
(
STATUS
"Ultimate fallback, revision was blank or not set: will use 0"
)
set
(
VIEWER_VERSION_REVISION 0
)
set
(
VIEWER_VERSION_REVISION 0
)
endif
(
"
${
VIEWER_VERSION_REVISION
}
"
STREQUAL
""
)
endif
(
"
${
VIEWER_VERSION_REVISION
}
"
STREQUAL
""
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment