diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,12 @@ cmake_minimum_required(VERSION 3.0.0) -project(parley) +# KDE Application Version, managed by release script +set(KDE_APPLICATIONS_VERSION_MAJOR "18") +set(KDE_APPLICATIONS_VERSION_MINOR "03") +set(KDE_APPLICATIONS_VERSION_MICRO "70") +set(KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") + +project(parley VERSION ${KDE_APPLICATIONS_VERSION}) find_package(ECM 5.15.0 REQUIRED NO_MODULE) @@ -74,6 +80,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/config-parley.h ) +# let our config-parley.h be found first in any case +include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR}) + # Define link libs for parley executable and unittests diff --git a/config-parley.h.cmake b/config-parley.h.cmake --- a/config-parley.h.cmake +++ b/config-parley.h.cmake @@ -2,3 +2,7 @@ #cmakedefine HAVE_LIBXSLT 1 /* xrender available for fading pixmaps */ #cmakedefine HAVE_XRENDER 1 + +/* Parleys application version string + * It is adopted from script updated KDE Application version in top-level CMakeLists.txt */ +#define PARLEY_VERSION_STRING "@parley_VERSION@" diff --git a/src/main.cpp b/src/main.cpp --- a/src/main.cpp +++ b/src/main.cpp @@ -24,7 +24,7 @@ /// @file main.cpp #include "parleymainwindow.h" -#include "version.h" +#include "config-parley.h" #include #include @@ -144,4 +144,4 @@ parleyApp->show(); return app.exec(); } -} +} \ No newline at end of file diff --git a/src/parleydocument.cpp b/src/parleydocument.cpp --- a/src/parleydocument.cpp +++ b/src/parleydocument.cpp @@ -18,7 +18,6 @@ #include "../config-parley.h" #include "parleymainwindow.h" #include "editor/editor.h" -#include "version.h" #include "prefs.h" #include "vocabularyview.h" diff --git a/src/version.h b/src/version.h deleted file mode 100644 --- a/src/version.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef VERSION_H -#define VERSION_H -#define PARLEY_VERSION_STRING "2.1.0" // To be released with Applications/15.04 -#endif