kuassel: cleanup

diff --git a/kuassel/CMakeLists.txt b/kuassel/CMakeLists.txt
index 5a09705..cb7cf1e 100644 (file)
--- a/kuassel/CMakeLists.txt
+++ b/kuassel/CMakeLists.txt
@@ -9,12 +9,13 @@
 cmake_minimum_required(VERSION 2.8.9)
 project(KuasselIRC)
 
-# Versions
-set(QUASSEL_MAJOR  0)
-set(QUASSEL_MINOR 12)
-set(QUASSEL_PATCH  0)
+# Version
 set(QUASSEL_VERSION_STRING "0.12")
 
+# General conveniences
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
 # Tell CMake about or own modules
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
@@ -155,17 +156,6 @@ add_feature_info("syslog.h" HAVE_SYSLOG "Provide support for logging to the sysl
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
 
-# Set global buildflags
-# This is very much non-portable, so don't use -DSTATIC until you know what
-# you do.
-if(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_CXX_FLAGS "-static-libgcc ${CMAKE_CXX_FLAGS}")
-  link_directories(${CMAKE_BINARY_DIR}/staticlibs) # override dynamic libs
-  if(HAVE_SSL)
-    set(QUASSEL_SSL_LIBRARIES ssl crypto)  # these miss in static builds
-  endif(HAVE_SSL)
-endif(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
-
 if(INDICATEQT_FOUND)
   add_definitions(-DXDG_APPS_INSTALL_DIR=${XDG_APPS_INSTALL_DIR})
 endif()

diff --git a/kuassel/src/client/clientauthhandler.cpp b/kuassel/src/client/clientauthhandler.cpp
index 0cf6853..07e2355 100644 (file)
--- a/kuassel/src/client/clientauthhandler.cpp
+++ b/kuassel/src/client/clientauthhandler.cpp
@@ -283,7 +283,7 @@ void ClientAuthHandler::startRegistration()
     useSsl = _account.useSsl();
 #endif
 
-    _peer->dispatch(RegisterClient(Quassel::buildInfo().plainVersionString, useSsl));
+    _peer->dispatch(RegisterClient(QString("v%1").arg(Quassel::buildInfo().baseVersion), useSsl));
 }
 
 

diff --git a/kuassel/src/common/main.cpp b/kuassel/src/common/main.cpp
index a2f0665..9abc002 100644 (file)
--- a/kuassel/src/common/main.cpp
+++ b/kuassel/src/common/main.cpp
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 
     // We need to init KCmdLineArgs first
     // TODO: build an AboutData compat class to replace our aboutDlg strings
-    KAboutData aboutData("kuassel", "kdelibs4", ki18n("Kuassel IRC"), Quassel::buildInfo().plainVersionString.toUtf8(),
+    KAboutData aboutData("kuassel", "kdelibs4", ki18n("Kuassel IRC"), Quassel::buildInfo().baseVersion.toUtf8(),
         ki18n("A modern, distributed IRC client"),
         KAboutData::License_GPL_V2,
         ki18n("(c) 2005-2014 Quassel Project\n"

diff --git a/kuassel/src/common/quassel.cpp b/kuassel/src/common/quassel.cpp
index 75c272e..6a2f4be 100644 (file)
--- a/kuassel/src/common/quassel.cpp
+++ b/kuassel/src/common/quassel.cpp
@@ -118,7 +118,7 @@ bool Quassel::init()
     }
 
     if (isOptionSet("version")) {
-        std::cout << qPrintable("Kuassel IRC: " + Quassel::buildInfo().plainVersionString) << std::endl;
+        std::cout << qPrintable("Kuassel IRC: " + Quassel::buildInfo().baseVersion) << std::endl;
         return false;
     }
 
@@ -208,7 +208,6 @@ void Quassel::setupBuildInfo()
 {
     _buildInfo.applicationName = "kuassel";
     _buildInfo.baseVersion = QUASSEL_VERSION_STRING;
-    _buildInfo.plainVersionString = QString("v%1").arg(_buildInfo.baseVersion);
 }
 
 

diff --git a/kuassel/src/common/quassel.h b/kuassel/src/common/quassel.h
index 1cd8dae..46554c8 100644 (file)
--- a/kuassel/src/common/quassel.h
+++ b/kuassel/src/common/quassel.h
@@ -44,7 +44,6 @@ public:
     struct BuildInfo {
         QString baseVersion;
         QString applicationName;
-        QString plainVersionString; // no <a> tag
     };
 
     //! A list of features that are optional in core and/or client, but need runtime checking

diff --git a/kuassel/version.h.in b/kuassel/version.h.in
index 2cd1232..77494c5 100644 (file)
--- a/kuassel/version.h.in
+++ b/kuassel/version.h.in
@@ -1,7 +1,4 @@
 // Version information
-#define QUASSEL_MAJOR @QUASSEL_MAJOR@
-#define QUASSEL_MINOR @QUASSEL_MINOR@
-#define QUASSEL_PATCH @QUASSEL_PATCH@
 #define QUASSEL_VERSION_STRING "@QUASSEL_VERSION_STRING@"
 
 // Determined from Git