Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Institute of Technical Acoustics (ITA)
VACore
Commits
7d216a20
Commit
7d216a20
authored
Oct 26, 2016
by
Dipl.-Ing. Jonas Stienen
Browse files
Introducing new version naming
parent
b1a9329f
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
7d216a20
...
...
@@ -43,10 +43,10 @@ vista_use_package( OpenDAFF REQUIRED )
vista_find_package
(
RavenNet QUIET
)
if
(
NOT DEFINED ITA_VACORE_VERSION_MAJOR
)
set
(
ITA_VACORE_VERSION_MAJOR
1
CACHE IN
T
"VACore version major"
)
set
(
ITA_VACORE_VERSION_MAJOR
"v2016"
CACHE
STR
IN
G
"VACore version major
(usually 'v' and year)
"
)
endif
(
NOT DEFINED ITA_VACORE_VERSION_MAJOR
)
if
(
NOT DEFINED ITA_VACORE_VERSION_MINOR
)
set
(
ITA_VACORE_VERSION_MINOR
24
CACHE IN
T
"VACore version minor"
)
set
(
ITA_VACORE_VERSION_MINOR
"a"
CACHE
STR
IN
G
"VACore version minor
(usually a,b,c ...)
"
)
endif
(
NOT DEFINED ITA_VACORE_VERSION_MINOR
)
# Settings
...
...
@@ -190,8 +190,8 @@ endif( NOT ITA_VA_BUILD_STATIC )
add_definitions
(
"-DVACORE_DEFAULT_LOG_LEVEL=
${
ITA_VACORE_DEFAULT_DEBUG_LEVEL
}
"
)
add_definitions
(
"-DVACORE_VERSION_MAJOR=
${
ITA_VACORE_VERSION_MAJOR
}
"
)
add_definitions
(
"-DVACORE_VERSION_MINOR=
${
ITA_VACORE_VERSION_MINOR
}
"
)
add_definitions
(
"-DVACORE_VERSION_MAJOR=
\"
${
ITA_VACORE_VERSION_MAJOR
}
\"
"
)
add_definitions
(
"-DVACORE_VERSION_MINOR=
\"
${
ITA_VACORE_VERSION_MINOR
}
\"
"
)
if
(
${
ITA_VACORE_MODULE_INTERFACE_ENABLED
}
)
add_definitions
(
"-DVACORE_MODULE_INTERFACE_ENABLED=1"
)
...
...
src/VACoreImpl.cpp
View file @
7d216a20
...
...
@@ -410,9 +410,9 @@ void CVACoreImpl::GetVersionInfo(CVACoreVersionInfo* pVersionInfo) const
pVersionInfo
->
sFlags
=
""
;
#ifdef DEBUG
pVersionInfo
->
sComments
=
"
D
ebug
build
"
;
pVersionInfo
->
sComments
=
"
d
ebug"
;
#else
pVersionInfo
->
sComments
=
"
R
elease
build
"
;
pVersionInfo
->
sComments
=
"
r
elease"
;
#endif
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment