Fixed some versioning errors

klnusbaum · Aug 25, 2012 · 0e1258d · 0e1258d
1 parent a12b7a4
commit 0e1258d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,9 +18,10 @@
 
 cmake_minimum_required(VERSION 2.8.7)
 PROJECT(UDJ)
-SET(PROJECT_VERSION_MAJOR 0)
-SET(PROJECT_VERSION_MINOR 6)
-SET(PROJECT_VERSION_PATCH 0)
+include(VERSION.cmake)
+SET(PROJECT_VERSION_MAJOR ${VERSION_MAJOR})
+SET(PROJECT_VERSION_MINOR ${VERSION_MINOR})
+SET(PROJECT_VERSION_PATCH ${VERSION_PATCH})
 SET(PROJECT_COPYRIGHT_YEAR 2011)
 SET(PROJECT_VERNDOR "Bazaar Solutions")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")

diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,5 +1,5 @@
 set( VERSION_MAJOR 0 )
-set( VERSION_MINOR 5 )
+set( VERSION_MINOR 6 )
 set( VERSION_PATCH 0 )
 set( VERSION  ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} )
 
diff --git a/src/AboutWidget.cpp b/src/AboutWidget.cpp
@@ -25,7 +25,7 @@ namespace UDJ{
 
 AboutWidget::AboutWidget(QWidget *parent):QWidget(parent){
   QVBoxLayout *mainLayout = new QVBoxLayout();
-  mainLayout->addWidget(new QLabel(tr("UDJ Player Client Version " + UDJ_VERSION)));
+  mainLayout->addWidget(new QLabel(tr("UDJ Player Client Version "  UDJ_VERSION)));
   mainLayout->addSpacing(1);
   mainLayout->addWidget(new QLabel(tr("Written By Kurtis Nusbaum")));
   mainLayout->addSpacing(1);