Commit b03f5b76 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Don't use the git revision when checking the config file version.

parent 0a9edd28
......@@ -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}")
......
......@@ -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@"
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment