From 85dc437da27417cce05b5a9f97505b43cfdf4dee Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 23 Aug 2017 18:39:44 -0600
Subject: The grand cmake cleanup

We had a ton of duplication in our cmake code because we had no common
toplevel settings. This is now cleaned up so we can sanely change
settings and so we know what we have set.
---
 framework/CMakeLists.txt                               | 18 +-----------------
 framework/src/CMakeLists.txt                           |  1 +
 .../src/domain/mime/mimetreeparser/CMakeLists.txt      |  5 +----
 framework/src/domain/mime/tests/CMakeLists.txt         |  1 -
 framework/src/domain/settings/CMakeLists.txt           |  1 -
 5 files changed, 3 insertions(+), 23 deletions(-)

(limited to 'framework')

diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
index 85ead14d..431c1ac4 100644
--- a/framework/CMakeLists.txt
+++ b/framework/CMakeLists.txt
@@ -1,22 +1,6 @@
-cmake_minimum_required(VERSION 2.8.12)
-
-
-# ECM setup
-find_package(ECM 0.0.10 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH
-        ${ECM_MODULE_PATH}
-        ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
-        ${CMAKE_MODULE_PATH})
-
-include(FeatureSummary)
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
-include(ECMPackageConfigHelpers)
-include(KDEInstallDirs)
-
-set(CMAKE_AUTOMOC ON)
-
-enable_testing()
+include(CMakePackageConfigHelpers)
 
 set(FRAMEWORK_INSTALL_DIR ${QML_INSTALL_DIR}/org/kube/framework)
 
diff --git a/framework/src/CMakeLists.txt b/framework/src/CMakeLists.txt
index 1ac9d3c2..a22e8c06 100644
--- a/framework/src/CMakeLists.txt
+++ b/framework/src/CMakeLists.txt
@@ -9,6 +9,7 @@ find_package(KF5Package CONFIG REQUIRED)
 find_package(KF5Contacts CONFIG REQUIRED)
 
 add_definitions("-Wall -std=c++0x -g")
+set(CMAKE_CXX_VISIBILITY_PRESET default)
 
 include_directories(. domain/mime/mimetreeparser domain/ domain/mime)
 
diff --git a/framework/src/domain/mime/mimetreeparser/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/CMakeLists.txt
index 9f67d784..3cdbc173 100644
--- a/framework/src/domain/mime/mimetreeparser/CMakeLists.txt
+++ b/framework/src/domain/mime/mimetreeparser/CMakeLists.txt
@@ -1,17 +1,14 @@
-add_definitions("-fvisibility=default")
+set(CMAKE_CXX_VISIBILITY_PRESET default)
 
 find_package(Qt5 COMPONENTS REQUIRED Core Gui)
 find_package(KF5Mime "4.87.0" CONFIG REQUIRED)
 find_package(QGpgme CONFIG REQUIRED)
 find_package(KF5Codecs CONFIG REQUIRED)
-find_package(ECM 1.0.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH
         ${ECM_MODULE_PATH}
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_MODULE_PATH})
 
-#add_definitions(-DTRANSLATION_DOMAIN=\"libmimetreeparser\")
-
 # target_include_directories does not handle empty include paths
 include_directories(${GPGME_INCLUDES})
 
diff --git a/framework/src/domain/mime/tests/CMakeLists.txt b/framework/src/domain/mime/tests/CMakeLists.txt
index f94447ff..2844d7ed 100644
--- a/framework/src/domain/mime/tests/CMakeLists.txt
+++ b/framework/src/domain/mime/tests/CMakeLists.txt
@@ -5,7 +5,6 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     )
 
-include(ECMAddTests)
 find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Test WebEngine)
 
 include( ${CMAKE_SOURCE_DIR}/cmake/modules/add_gpg_crypto_test.cmake )
diff --git a/framework/src/domain/settings/CMakeLists.txt b/framework/src/domain/settings/CMakeLists.txt
index e9ea76c6..1e218e97 100644
--- a/framework/src/domain/settings/CMakeLists.txt
+++ b/framework/src/domain/settings/CMakeLists.txt
@@ -1,5 +1,4 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-cmake_policy(SET CMP0063 NEW)
 add_executable(sinkactiontest sinkactiontest.cpp)
 add_test(sinkactiontest sinkactiontest)
 target_link_libraries(sinkactiontest
-- 
cgit v1.2.3