[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ktp-text-ui/filters] /: Configure version in CMakeLists.txt instead of in main.cpp
From:       Daniele E. Domenichelli <daniele.domenichelli () gmail ! com>
Date:       2012-11-01 0:00:06
Message-ID: 20121101000006.49261A6078 () git ! kde ! org
[Download RAW message or body]

Git commit c4ee109a419ed68a8f0c635ac0192836a9e177cd by Daniele E. Domeniche=
lli.
Committed on 31/10/2012 at 15:28.
Pushed by ddomenichelli into branch 'filters'.

Configure version in CMakeLists.txt instead of in main.cpp

Reviewed-by: David Edmundson <kde@davidedmundson.co.uk>
REVIEW: 107151

M  +4    -0    CMakeLists.txt
M  +2    -1    adiumxtra-protocol-handler/main.cpp
M  +2    -1    app/main.cpp
M  +2    -1    logviewer/main.cpp
A  +1    -0    version.h.in

http://commits.kde.org/telepathy-text-ui/c4ee109a419ed68a8f0c635ac0192836a9=
e177cd

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 609a07a..5871db4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 project(ktp-text-ui)
 =

+set(KTP_TEXT_UI_VERSION "0.5.1")
 set(IS_KTP_INTERNAL_MODULE TRUE)
 =

 # Include our extra FindFoo.cmake files.
@@ -38,6 +39,9 @@ if(TELEPATHY_LOGGER_QT4_FOUND)
     )
 endif()
 =

+configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
 add_subdirectory(lib)
 add_subdirectory(app)
 add_subdirectory(config)
diff --git a/adiumxtra-protocol-handler/main.cpp b/adiumxtra-protocol-handl=
er/main.cpp
index 8610008..8930a40 100644
--- a/adiumxtra-protocol-handler/main.cpp
+++ b/adiumxtra-protocol-handler/main.cpp
@@ -17,6 +17,7 @@
 */
 =

 #include "adiumxtra-protocol-handler.h"
+#include "version.h"
 =

 #include <KApplication>
 #include <KAboutData>
@@ -28,7 +29,7 @@ int main(int argc, char *argv[])
     KAboutData aboutData("ktp-adiumxtra-protocol-handler",
                          0,
                          ki18n("AdiumXtra Protocol Handler"),
-                         "0.3.60");
+                         KTP_TEXT_UI_VERSION);
     aboutData.addAuthor(ki18n("Dominik Schmidt"), ki18n("Developer"), "kde=
@dominik-schmidt.de");
     aboutData.addAuthor(ki18n("Daniele E. Domenichelli"), ki18n("Developer=
"), "daniele.domenichelli@gmail.com");
     aboutData.setProductName("telepathy/text-ui"); //set the correct name =
for bug reporting
diff --git a/app/main.cpp b/app/main.cpp
index e6ac76a..af0e7e7 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -20,6 +20,7 @@
 #include "telepathy-chat-ui.h"
 =

 #include "defines.h"
+#include "version.h"
 =

 #include <TelepathyQt/ClientRegistrar>
 #include <TelepathyQt/AccountFactory>
@@ -36,7 +37,7 @@ int main(int argc, char *argv[])
 {
     KAboutData aboutData("ktp-text-ui", 0,
                          ki18n("Telepathy Text Ui"),
-                         "0.5.1");
+                         KTP_TEXT_UI_VERSION);
     aboutData.addAuthor(ki18n("David Edmundson"), ki18n("Developer"), "dav=
id@davidedmundson.co.uk");
     aboutData.addAuthor(ki18n("Dominik Schmidt"), ki18n("Developer"), "kde=
@dominik-schmidt.de");
     aboutData.addAuthor(ki18n("Francesco Nwokeka"), ki18n("Developer"), "f=
rancesco.nwokeka@gmail.com");
diff --git a/logviewer/main.cpp b/logviewer/main.cpp
index 98c5123..e7eb0b5 100644
--- a/logviewer/main.cpp
+++ b/logviewer/main.cpp
@@ -21,13 +21,14 @@
 #include <KCmdLineArgs>
 #include <KAboutData>
 #include "log-viewer.h"
+#include "version.h"
 =

 int main(int argc, char *argv[])
 {
     KAboutData aboutData("ktp-log-viewer",
                          0,
                          ki18n("KDE IM Log Viewer"),
-                         "0.5.1");
+                         KTP_TEXT_UI_VERSION);
     aboutData.addAuthor(ki18n("David Edmundson"), ki18n("Developer"), "kde=
@davidedmundson.co.uk");
     aboutData.addAuthor(ki18n("Daniele E. Domenichelli"), ki18n("Developer=
"), "daniele.domenichelli@gmail.com");
     aboutData.setProductName("telepathy/log-viewer"); //set the correct na=
me for bug reporting
diff --git a/version.h.in b/version.h.in
new file mode 100644
index 0000000..a4e11bf
--- /dev/null
+++ b/version.h.in
@@ -0,0 +1 @@
+#define KTP_TEXT_UI_VERSION "@KTP_TEXT_UI_VERSION@"

[prev in list] [next in list] [prev in thread] [next in thread]