We require cmake-2.6 now. Also LINGUAS should work again...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 041e2d7..e28d90f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,11 +16,11 @@
 
 project(QuasselIRC)
 
 
 project(QuasselIRC)
 

-# Target scopes don't work in older versions
-cmake_minimum_required(VERSION 2.4.7 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)

 
 if(COMMAND cmake_policy)
    cmake_policy(SET CMP0003 NEW)
 
 if(COMMAND cmake_policy)
    cmake_policy(SET CMP0003 NEW)

+   cmake_policy(SET CMP0005 NEW)

 endif(COMMAND cmake_policy)
 
 # Use our own (well, and KDE's) version of some modules
 endif(COMMAND cmake_policy)
 
 # Use our own (well, and KDE's) version of some modules


@@ -61,6 +61,8 @@ set(DATA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/apps)
 set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
 set(XDG_APPS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/applications)
 
 set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
 set(XDG_APPS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/applications)
 

+add_definitions(-DPREFIX=${CMAKE_INSTALL_PREFIX})
+

 # Enable various flags on gcc
 if(CMAKE_COMPILER_IS_GNUCXX)
   # Let's just hope that all gccs support these options and skip the tests...
 # Enable various flags on gcc
 if(CMAKE_COMPILER_IS_GNUCXX)
   # Let's just hope that all gccs support these options and skip the tests...

diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
index 8f9f38e..909b968 100644 (file)
--- a/i18n/CMakeLists.txt
+++ b/i18n/CMakeLists.txt
@@ -13,9 +13,9 @@ if(QT_LRELEASE_EXECUTABLE)
     string(REGEX REPLACE "quassel_(.+)$" "\\1" lang ${basename})
     # test if we want this
     set(flg 1)
     string(REGEX REPLACE "quassel_(.+)$" "\\1" lang ${basename})
     # test if we want this
     set(flg 1)

-    if(linguas)
-      string(REGEX MATCH "${lang}" flg ${linguas})
-    endif(linguas)
+    if(LINGUAS)
+      string(REGEX MATCH "${lang}" flg ${LINGUAS})
+    endif(LINGUAS)

     if(flg)
       generate_qm(QM ${basename})
       set(qm_files ${qm_files} ${QM})
     if(flg)
       generate_qm(QM ${basename})
       set(qm_files ${qm_files} ${QM})

diff --git a/src/common/network.cpp b/src/common/network.cpp
index 58171fe..1098b0a 100644 (file)
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -684,16 +684,16 @@ void Network::emitConnectionError(const QString &errorMsg) {
 // ====================
 void Network::determinePrefixes() {
   // seems like we have to construct them first
 // ====================
 void Network::determinePrefixes() {
   // seems like we have to construct them first

-  QString PREFIX = support("PREFIX");
+  QString prefix = support("PREFIX");

   
   

-  if(PREFIX.startsWith("(") && PREFIX.contains(")")) {
-    _prefixes = PREFIX.section(")", 1);
-    _prefixModes = PREFIX.mid(1).section(")", 0, 0);
+  if(prefix.startsWith("(") && prefix.contains(")")) {
+    _prefixes = prefix.section(")", 1);
+    _prefixModes = prefix.mid(1).section(")", 0, 0);

   } else {
     QString defaultPrefixes("~&@%+");
     QString defaultPrefixModes("qaohv");
 
   } else {
     QString defaultPrefixes("~&@%+");
     QString defaultPrefixModes("qaohv");
 

-    if(PREFIX.isEmpty()) {
+    if(prefix.isEmpty()) {

       _prefixes = defaultPrefixes;
       _prefixModes = defaultPrefixModes;
       return;
       _prefixes = defaultPrefixes;
       _prefixModes = defaultPrefixModes;
       return;


@@ -701,7 +701,7 @@ void Network::determinePrefixes() {
 
     // we just assume that in PREFIX are only prefix chars stored
     for(int i = 0; i < defaultPrefixes.size(); i++) {
 
     // we just assume that in PREFIX are only prefix chars stored
     for(int i = 0; i < defaultPrefixes.size(); i++) {

-      if(PREFIX.contains(defaultPrefixes[i])) {
+      if(prefix.contains(defaultPrefixes[i])) {

        _prefixes += defaultPrefixes[i];
        _prefixModes += defaultPrefixModes[i];
       }
        _prefixes += defaultPrefixes[i];
        _prefixModes += defaultPrefixModes[i];
       }


@@ -713,7 +713,7 @@ void Network::determinePrefixes() {
     // well... our assumption was obviously wrong...
     // check if it's only prefix modes
     for(int i = 0; i < defaultPrefixes.size(); i++) {
     // well... our assumption was obviously wrong...
     // check if it's only prefix modes
     for(int i = 0; i < defaultPrefixes.size(); i++) {

-      if(PREFIX.contains(defaultPrefixModes[i])) {
+      if(prefix.contains(defaultPrefixModes[i])) {

        _prefixes += defaultPrefixes[i];
        _prefixModes += defaultPrefixModes[i];
       }
        _prefixes += defaultPrefixes[i];
        _prefixModes += defaultPrefixModes[i];
       }