Commit 273d6142 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Updating vlmc version for master.

Updating config.h.cmake to have the version available through a define
parent 57cbe226
......@@ -4,8 +4,8 @@
#Project Info
SET(CPACK_PACKAGE_VERSION_MAJOR "0")
SET(CPACK_PACKAGE_VERSION_MINOR "0")
SET(CPACK_PACKAGE_VERSION_PATCH "1")
SET(CPACK_PACKAGE_VERSION_MINOR "1")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
# Codename of the Project :-)
......
......@@ -16,4 +16,7 @@
/* Host computer name */
#cmakedefine HOSTNAME "@HOSTNAME@"
/* VLMC's version */
#cmakedefine PROJECT_VERSION "@PROJECT_VERSION@"
#endif //CONFIG_H
......@@ -26,6 +26,7 @@
* and start it.
*/
#include "config.h"
#include "MainWindow.h"
#include "SettingsManager.h"
......@@ -37,10 +38,6 @@
#include <QSettings>
#include <QKeySequence>
#ifndef VLMC_VERSION
#define VLMC_VERSION Unknown
#endif
#define EXPAND( x ) #x
#define STRINGIFY( x ) EXPAND( x )
......@@ -58,7 +55,7 @@ VLMCmain( int argc, char **argv )
app.setApplicationName( "vlmc" );
app.setOrganizationName( "vlmc" );
app.setOrganizationDomain( "vlmc.org" );
app.setApplicationVersion( STRINGIFY(VLMC_VERSION) );
app.setApplicationVersion( PROJECT_VERSION );
//QSettings::setDefaultFormat( QSettings::IniFormat );
//Preferences::changeLang( QSettings().value( "Lang" ).toString() );
......@@ -99,8 +96,6 @@ VLMCmain( int argc, char **argv )
app.setPalette( p );
MainWindow w;
QSettings s;
s.setValue( "VlmcVersion", STRINGIFY( VLMC_VERSION ) );
w.show();
return app.exec();
}
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