Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
VideoLAN
VLMC
Commits
b03f5b76
Commit
b03f5b76
authored
Oct 26, 2010
by
Hugo Beauzée-Luyssen
Browse files
Don't use the git revision when checking the config file version.
parent
0a9edd28
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
b03f5b76
...
...
@@ -55,6 +55,7 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "0")
SET
(
CPACK_PACKAGE_VERSION_MINOR
"2"
)
SET
(
CPACK_PACKAGE_VERSION_PATCH
${
PROJECT_VERSION_PATCH
}
)
SET
(
CPACK_PACKAGE_VERSION
${
CPACK_PACKAGE_VERSION_MAJOR
}
.
${
CPACK_PACKAGE_VERSION_MINOR
}
.
${
CPACK_PACKAGE_VERSION_PATCH
}
)
SET
(
PROJECT_VERSION_MAJOR
${
CPACK_PACKAGE_VERSION_MAJOR
}
.
${
CPACK_PACKAGE_VERSION_MINOR
}
)
SET
(
PROJECT_VERSION
${
CPACK_PACKAGE_VERSION
}
)
MESSAGE
(
STATUS
"VLMC Version:
${
PROJECT_VERSION
}
"
)
...
...
cmake/config.h.cmake
View file @
b03f5b76
...
...
@@ -19,6 +19,9 @@
/* OS Name */
#cmakedefine SYSNAME "@SYSNAME@"
/* VLMC's major version */
#cmakedefine PROJECT_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@"
/* VLMC's version */
#cmakedefine PROJECT_VERSION "@PROJECT_VERSION@"
...
...
src/Gui/MainWindow.cpp
View file @
b03f5b76
...
...
@@ -322,7 +322,7 @@ MainWindow::initVlmcPreferences()
//Load saved preferences :
QSettings
s
;
if
(
s
.
value
(
"VlmcVersion"
).
toString
()
!=
PROJECT_VERSION
)
if
(
s
.
value
(
"VlmcVersion"
).
toString
()
!=
PROJECT_VERSION
_MAJOR
)
s
.
clear
();
else
{
...
...
@@ -331,7 +331,7 @@ MainWindow::initVlmcPreferences()
loadVlmcPreferences
(
"youtube"
);
loadVlmcPreferences
(
"network"
);
}
s
.
setValue
(
"VlmcVersion"
,
PROJECT_VERSION
);
s
.
setValue
(
"VlmcVersion"
,
PROJECT_VERSION
_MAJOR
);
}
void
...
...
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