- fix version (#48)

jacquetc · Oct 9, 2020 · bec5830 · bec5830
1 parent a0d730e
commit bec5830
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,9 +19,14 @@ version_from_git(
   TIMESTAMP "%Y%m%d%H%M%S"
 )
 
-add_definitions(-DSKR_VERSION_STR=${VERSION})
-add_definitions(-DSKR_SEMANTICVERSION_STR=${SEMVER})
-add_definitions(-DSKR_GITTAG_STR=${GIT_TAG})
+add_definitions(-DSKR_VERSION=${VERSION})
+add_definitions(-DSKR_SEMANTIC_VERSION=${SEMVER})
+add_definitions(-DSKR_GIT_TAG=${GIT_TAG})
+add_compile_definitions(SKR_VERSION=${VERSION})
+add_compile_definitions(SKR_SEMANTIC_VERSION=${SEMVER})
+add_compile_definitions(SKR_GIT_TAG=${GIT_TAG})
+add_compile_definitions(SKR_VERSION_MAJOR=${VERSION_MAJOR})
+add_compile_definitions(SKR_VERSION_MINOR=${VERSION_MINOR})
 
 project(skribisto LANGUAGES CXX VERSION ${VERSION})
 

diff --git a/src/app/src/main.cpp b/src/app/src/main.cpp
@@ -54,8 +54,8 @@ void startCore()
     QCoreApplication::setOrganizationName("skribisto");
     QCoreApplication::setOrganizationDomain("skribisto.eu");
 
-
-    QCoreApplication::setApplicationVersion(QString::number(VERSIONSTR));
+    QCoreApplication::setApplicationVersion(QString::number(SKR_VERSION_MAJOR) + "." + QString::number(SKR_VERSION_MINOR));
+    qDebug() << QCoreApplication::applicationVersion();
     QString appName = "Skribisto";
 
     QCoreApplication::setApplicationName(appName);