From b0fac41c27c7829241e7aac7aa85e6c618793fb6 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <domme@tomahawk-player.org>
Date: Thu, 5 Nov 2015 17:07:10 +0100
Subject: [PATCH] Get rid of warnings

---
 CMakeLists.txt                                     | 11 ++++++-----
 src/tomahawk/CMakeLists.txt                        |  3 ---
 thirdparty/kdsingleapplicationguard/CMakeLists.txt |  3 +++
 thirdparty/libcrashreporter-qt                     |  2 +-
 thirdparty/qt-certificate-addon/CMakeLists.txt     |  4 +++-
 thirdparty/qxt/qxtweb-standalone/CMakeLists.txt    |  2 ++
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 988790ad3..63816bdb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,15 @@
 PROJECT( tomahawk )
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8.6 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
 CMAKE_POLICY(SET CMP0017 NEW)
-
-IF ( CMAKE_VERSION VERSION_EQUAL 2.8.12 OR CMAKE_VERSION VERSION_GREATER 2.8.12 )
 CMAKE_POLICY(SET CMP0022 NEW)
 
 # TODO:
-# Update to NEW and fix things up when we can depend on 2.8.12
+# Update to NEW and fix things up
 CMAKE_POLICY(SET CMP0023 OLD)
-ENDIF()
+
+# TODO:
+# Disable automatic qtmain linking
+CMAKE_POLICY(SET CMP0020 OLD)
 
 find_package(ECM 1.7.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt
index 5bdaee8f0..92a7afac5 100644
--- a/src/tomahawk/CMakeLists.txt
+++ b/src/tomahawk/CMakeLists.txt
@@ -1,6 +1,3 @@
-PROJECT( tomahawk )
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
-
 set(TOMAHAWK_APPLICATION_TARGET "tomahahawk-bin")
 
 include( ECMAddAppIcon )
diff --git a/thirdparty/kdsingleapplicationguard/CMakeLists.txt b/thirdparty/kdsingleapplicationguard/CMakeLists.txt
index 8354f5240..af4cf8704 100644
--- a/thirdparty/kdsingleapplicationguard/CMakeLists.txt
+++ b/thirdparty/kdsingleapplicationguard/CMakeLists.txt
@@ -1,4 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
+
+cmake_policy(SET CMP0020 OLD)
+
 project(kdsingleapplicationguard)
 
 list(APPEND kdsingleapplicationguard_INCLUDE_DIRECTORIES
diff --git a/thirdparty/libcrashreporter-qt b/thirdparty/libcrashreporter-qt
index e8fffe61e..0dc4a719c 160000
--- a/thirdparty/libcrashreporter-qt
+++ b/thirdparty/libcrashreporter-qt
@@ -1 +1 @@
-Subproject commit e8fffe61e7c94ce88e59b80579754c4a46da65ea
+Subproject commit 0dc4a719ca98f3bf942a8e722478c8bf1b192cb4
diff --git a/thirdparty/qt-certificate-addon/CMakeLists.txt b/thirdparty/qt-certificate-addon/CMakeLists.txt
index fa6909dcc..570319a36 100644
--- a/thirdparty/qt-certificate-addon/CMakeLists.txt
+++ b/thirdparty/qt-certificate-addon/CMakeLists.txt
@@ -1,5 +1,7 @@
-cmake_minimum_required(VERSION 2.6)
 project(qtcertificateaddon)
 
+cmake_minimum_required(VERSION 2.6)
+cmake_policy(SET CMP0020 OLD)
+
 add_subdirectory( src )
 
diff --git a/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt b/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt
index cc79bb0af..654a6aab5 100644
--- a/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt
+++ b/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt
@@ -1,6 +1,8 @@
 PROJECT(libqxtweb-standalone)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
 
+CMAKE_POLICY(SET CMP0020 OLD)
+
 IF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
   CMAKE_POLICY(SET CMP0017 NEW)
 ENDIF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )