Commit 1aa0f8ee authored by Andreas Cord-Landwehr's avatar Andreas Cord-Landwehr
Browse files

Use ecm_setup_version for setting the version.

parent ab39c06c
...@@ -33,6 +33,7 @@ include(KDEInstallDirs) ...@@ -33,6 +33,7 @@ include(KDEInstallDirs)
include(KDECMakeSettings) include(KDECMakeSettings)
include(KDECompilerSettings) include(KDECompilerSettings)
include(ECMOptionalAddSubdirectory) include(ECMOptionalAddSubdirectory)
include(ECMSetupVersion)
include(FeatureSummary) include(FeatureSummary)
find_package(Qt5 REQUIRED COMPONENTS find_package(Qt5 REQUIRED COMPONENTS
......
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
### ###
set(ARTIKULATE_VERSION_MAJOR 0)
set(ARTIKULATE_VERSION_MINOR 4)
set(ARTIKULATE_VERSION_PATCH 50)
# set config files after packages are searched ecm_setup_version(0.4.50
configure_file("${artikulate_SOURCE_DIR}/version.h.cmake" "${artikulate_BINARY_DIR}/version.h" @ONLY) VARIABLE_PREFIX ARTIKULATE
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/ArtikulateConfigVersion.cmake"
)
ecm_optional_add_subdirectory(qml) ecm_optional_add_subdirectory(qml)
......
...@@ -20,22 +20,17 @@ ...@@ -20,22 +20,17 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "application.h" #include "application.h"
// #include "version.h" #include "version.h"
#include <KAboutData> #include <KAboutData>
#include <KLocalizedString> #include <KLocalizedString>
#include <QDebug> #include <QDebug>
static const char description[] =
I18N_NOOP("Learn and practice pronunciation.");
static const char version[] = "0.4.50"; //ARTIKULATE_VERSION_STR; //FIXME
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData aboutData("artikulate", KAboutData aboutData("artikulate",
ki18nc("@title Displayed program name", "Artikulate").toString(), ki18nc("@title Displayed program name", "Artikulate").toString(),
version, ARTIKULATE_VERSION_STRING,
ki18nc("@title KAboutData: short program description", "Artikulate Pronunciation Trainer").toString(), ki18nc("@title KAboutData: short program description", "Artikulate Pronunciation Trainer").toString(),
KAboutLicense::GPL_V2, KAboutLicense::GPL_V2,
ki18nc("@info:credit", "(c) 2013-2014 The Artikulate Developers").toString(), ki18nc("@info:credit", "(c) 2013-2014 The Artikulate Developers").toString(),
......
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