From 643b8fac5d261e02e5aad5e66fbfd33fcfe5ae08 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt <dev@dominik-schmidt.de> Date: Wed, 2 Mar 2011 04:34:59 +0100 Subject: [PATCH] Move Tomahawk application info into top-level CMakeLists.txt --- CMakeLists.txt | 10 ++++++++++ src/config.h.in | 6 ++++++ src/tomahawkapp.cpp | 8 ++++---- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 60b77d20e..69f6f6cfd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,16 @@ PROJECT( tomahawk ) CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) +### +### Tomahawk application info +### +SET( ORGANIZATION_NAME "Tomahawk" ) +SET( ORGANIZATION_DOMAIN "tomahawk-player.org" ) +SET( APPLICATION_NAME "Player" ) +SET( VERSION "0.0.0" ) + + +# set paths SET( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/CMakeModules" ) SET( THIRDPARTY_DIR ${CMAKE_SOURCE_DIR}/thirdparty ) diff --git a/src/config.h.in b/src/config.h.in index 8a8d1807d..59e6bc80e 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -1,6 +1,12 @@ #ifndef CONFIG_H_IN #define CONFIG_H_IN +#cmakedefine ORGANIZATION_NAME "${ORGANIZATION_NAME}" +#cmakedefine ORGANIZATION_DOMAIN "${ORGANIZATION_DOMAIN}" +#cmakedefine APPLICATION_NAME "${APPLICATION_NAME}" +#cmakedefine VERSION "${VERSION}" + + #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" #cmakedefine SNOW_LEOPARD diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp index 860b2aed7..be34d4564 100644 --- a/src/tomahawkapp.cpp +++ b/src/tomahawkapp.cpp @@ -146,10 +146,10 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] ) #endif qDebug() << "TomahawkApp thread:" << this->thread(); - setOrganizationName( "Tomahawk" ); - setOrganizationDomain( "tomahawk.org" ); - setApplicationName( "Player" ); - setApplicationVersion( "0.0.0" ); + setOrganizationName( QLatin1String( ORGANIZATION_NAME ) ); + setOrganizationDomain( QLatin1String( ORGANIZATION_DOMAIN ) ); + setApplicationName( QLatin1String( APPLICATION_NAME ) ); + setApplicationVersion( QLatin1String( VERSION ) ); registerMetaTypes(); setupLogfile();