From 7da845a12d0fb9be7c1d8a6f393970ef354c663f Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 1 Mar 2017 13:08:59 +0100
Subject: cmake cleanup and set the version in project()

---
 CMakeLists.txt        | 16 +++++++++-------
 common/CMakeLists.txt | 27 +++++++++++++--------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d440572..e8e90fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,9 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0)
+
+cmake_policy(SET CMP0048 NEW)
+cmake_policy(SET CMP0028 NEW)
+
+project(sink VERSION 0.1.0)
 
 option(BUILD_MAILDIR "BUILD_MAILDIR" ON)
 option(BUILD_DAV "BUILD_DAV" ON)
@@ -6,10 +11,8 @@ option(AVOID_BINDING_REBUILD "AVOID_BINDING_REBUILD" OFF)
 option(CATCH_ERRORS "CATCH_ERRORS" OFF)
 option(ENABLE_MEMCHECK "Build valgrind tests" OFF)
 
-set(SINK_VERSION 0.1.0)
-
 # ECM setup
-find_package(ECM 0.0.10 REQUIRED NO_MODULE)
+find_package(ECM 1.0.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH
         ${ECM_MODULE_PATH}
         ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
@@ -18,12 +21,11 @@ set(CMAKE_MODULE_PATH
 
 include(FeatureSummary)
 include(GenerateExportHeader)
-include(ECMGenerateHeaders)
-include(ECMPackageConfigHelpers)
+include(CMakePackageConfigHelpers)
 include(ECMSetupVersion)
 include(KDEInstallDirs)
 
-find_package(Qt5 COMPONENTS REQUIRED Core Network)
+find_package(Qt5 COMPONENTS REQUIRED Core Network Gui)
 find_package(KF5 COMPONENTS REQUIRED Async Mime Contacts)
 find_package(FlatBuffers REQUIRED)
 
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index f6a8823..34e48c6 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,28 +1,27 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(domain)
 
-project(sink)
-
-ecm_setup_version("${SINK_VERSION}" VARIABLE_PREFIX Sink
-                        VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/sink_version.h"
-                        PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/SinkConfigVersion.cmake"
-                        SOVERSION 0
+ecm_setup_version(${sink_VERSION}
+    VARIABLE_PREFIX Sink
+    VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/sink_version.h"
+    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/SinkConfigVersion.cmake"
+    SOVERSION 0
 )
 
 ########### CMake Config Files ###########
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/Sink")
 
-ecm_configure_package_config_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/SinkConfig.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/SinkConfig.cmake"
-  INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
+configure_package_config_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/SinkConfig.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/SinkConfig.cmake"
+    INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
 )
 
 install(FILES
-  "${CMAKE_CURRENT_BINARY_DIR}/SinkConfig.cmake"
-  "${CMAKE_CURRENT_BINARY_DIR}/SinkConfigVersion.cmake"
-  DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
-  COMPONENT Devel
+    "${CMAKE_CURRENT_BINARY_DIR}/SinkConfig.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/SinkConfigVersion.cmake"
+    DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+    COMPONENT Devel
 )
 
 add_definitions("-fvisibility=hidden")
-- 
cgit v1.2.3