15 files changed, 21 insertions, 167 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fe755e9..611a19ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,31 @@
 cmake_minimum_required(VERSION 3.0)
-cmake_policy(SET CMP0048 NEW)
+project(kube VERSION 0.4)
+set (QT_MIN_VERSION "5.7.0")
+cmake_policy(SET CMP0011 NEW)
 cmake_policy(SET CMP0028 NEW)
+cmake_policy(SET CMP0048 NEW)
+cmake_policy(SET CMP0053 NEW)
 cmake_policy(SET CMP0063 NEW)
-project(kube VERSION 0.4)
+include(CPack)
-set (QT_MIN_VERSION "5.7.0")
+include(FeatureSummary)
+find_package(PkgConfig REQUIRED)
+find_package(ECM 5.29.0 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+include(KDEInstallDirs)
+include(KDECompilerSettings)
+include(KDECMakeSettings NO_POLICY_SCOPE)
 enable_testing()
 add_subdirectory(framework)
 add_subdirectory(components)
-add_subdirectory(accounts)
 add_subdirectory(icons)
 add_subdirectory(applications)
+add_subdirectory(accounts)
 add_subdirectory(tests)
diff --git a/accounts/gmail/CMakeLists.txt b/accounts/gmail/CMakeLists.txt
index ae98a20a..7a71264f 100644
--- a/accounts/gmail/CMakeLists.txt
+++ b/accounts/gmail/CMakeLists.txt
@@ -1,24 +1,5 @@
 project(kube-accounts-gmail)
-cmake_minimum_required(VERSION 2.8.12)
-cmake_policy(SET CMP0063 NEW)
-include(CPack)
-include(FeatureSummary)
-find_package(PkgConfig)
-################# set KDE specific information #################
-find_package(ECM 0.0.8 REQUIRED NO_MODULE)
-# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-include(KDEInstallDirs)
-include(KDECMakeSettings)
-include(KDECompilerSettings)
 find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)
 find_package(Sink CONFIG REQUIRED)
diff --git a/accounts/imap/CMakeLists.txt b/accounts/imap/CMakeLists.txt
index 259c8e69..5ec32bbc 100644
--- a/accounts/imap/CMakeLists.txt
+++ b/accounts/imap/CMakeLists.txt
@@ -1,24 +1,5 @@
 project(kube-accounts-imap)
-cmake_minimum_required(VERSION 2.8.12)
-cmake_policy(SET CMP0063 NEW)
-include(CPack)
-include(FeatureSummary)
-find_package(PkgConfig)
-################# set KDE specific information #################
-find_package(ECM 0.0.8 REQUIRED NO_MODULE)
-# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-include(KDEInstallDirs)
-include(KDECMakeSettings)
-include(KDECompilerSettings)
 find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Concurrent Quick Test Gui)
 find_package(Sink CONFIG REQUIRED)
diff --git a/accounts/imap/tests/CMakeLists.txt b/accounts/imap/tests/CMakeLists.txt
index 82d6059c..bf4ffe73 100644
--- a/accounts/imap/tests/CMakeLists.txt
+++ b/accounts/imap/tests/CMakeLists.txt
@@ -1,5 +1,4 @@
 include_directories(../)
-cmake_policy(SET CMP0063 NEW)
 add_executable(imapsettingstest settingstest.cpp)
 add_test(imapsettingstest settingstest)
 target_link_libraries(imapsettingstest
diff --git a/accounts/kolabnow/CMakeLists.txt b/accounts/kolabnow/CMakeLists.txt
index 8a178bf9..8b84d9da 100644
--- a/accounts/kolabnow/CMakeLists.txt
+++ b/accounts/kolabnow/CMakeLists.txt
@@ -1,24 +1,5 @@
 project(kube-accounts-kolabnow)
-cmake_minimum_required(VERSION 2.8.12)
-cmake_policy(SET CMP0063 NEW)
-include(CPack)
-include(FeatureSummary)
-find_package(PkgConfig)
-################# set KDE specific information #################
-find_package(ECM 0.0.8 REQUIRED NO_MODULE)
-# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-include(KDEInstallDirs)
-include(KDECMakeSettings)
-include(KDECompilerSettings)
 find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)
 find_package(Sink CONFIG REQUIRED)
diff --git a/accounts/maildir/CMakeLists.txt b/accounts/maildir/CMakeLists.txt
index b321f0ad..1b017328 100644
--- a/accounts/maildir/CMakeLists.txt
+++ b/accounts/maildir/CMakeLists.txt
@@ -1,24 +1,5 @@
 project(kube-accounts-maildir)
-cmake_minimum_required(VERSION 2.8.12)
-cmake_policy(SET CMP0063 NEW)
-include(CPack)
-include(FeatureSummary)
-find_package(PkgConfig)
-################# set KDE specific information #################
-find_package(ECM 0.0.8 REQUIRED NO_MODULE)
-# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-include(KDEInstallDirs)
-include(KDECMakeSettings)
-include(KDECompilerSettings)
 find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Concurrent Quick Test Gui)
 find_package(Sink CONFIG REQUIRED)
diff --git a/accounts/maildir/tests/CMakeLists.txt b/accounts/maildir/tests/CMakeLists.txt
index 2452e526..3083ccc0 100644
--- a/accounts/maildir/tests/CMakeLists.txt
+++ b/accounts/maildir/tests/CMakeLists.txt
@@ -1,5 +1,4 @@
 include_directories(../)
-cmake_policy(SET CMP0063 NEW)
 add_executable(settingstest settingstest.cpp)
 add_test(settingstest settingstest)
 target_link_libraries(settingstest
diff --git a/applications/kube/CMakeLists.txt b/applications/kube/CMakeLists.txt
index ed9942c5..2d0df2ad 100644
--- a/applications/kube/CMakeLists.txt
+++ b/applications/kube/CMakeLists.txt
@@ -1,33 +1,8 @@
 project(kube)
-cmake_minimum_required(VERSION 2.8.12)
-cmake_policy(SET CMP0063 NEW)
-include(CPack)
-include(FeatureSummary)
-find_package(PkgConfig)
-################# set KDE specific information #################
-if(APPLE OR WIN32)
-    # for an ecm_add_app_icon() implementation acception svg icons
-    set(ECM_MIN_VERSION 5.29.0)
-else()
-    set(ECM_MIN_VERSION 0.0.8)
-endif()
-find_package(ECM ${ECM_MIN_VERSION} REQUIRED NO_MODULE)
-# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-include(KDEInstallDirs)
-include(KDECMakeSettings)
-include(KDECompilerSettings)
 include(ECMAddAppIcon)
 find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets WebEngine)
 find_package(KF5 REQUIRED COMPONENTS Package)
 # install executable
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 8b988fab..7b06929f 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -1,26 +1,8 @@
 project(kube-components)
-cmake_minimum_required(VERSION 2.8.12)
-include(CPack)
-include(FeatureSummary)
-find_package(PkgConfig)
-################# set KDE specific information #################
-find_package(ECM 0.0.8 REQUIRED NO_MODULE)
-# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-include(KDEInstallDirs)
-include(KDECMakeSettings)
-include(KDECompilerSettings)
 find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets)
 find_package(KF5 REQUIRED COMPONENTS Package)
 macro(install_component name)
    install(DIRECTORY ${name}/contents/ui/ DESTINATION ${QML_INSTALL_DIR}/org/kube/components/${name})
    install(FILES ${name}/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/components/${name})
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(CMakePackageConfigHelpers)
-include(KDEInstallDirs)
-set(CMAKE_AUTOMOC ON)
-enable_testing()
 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
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f18ebc09..0515c052 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,23 +1,5 @@
 project(tests)
-cmake_minimum_required(VERSION 2.8.12)
-cmake_policy(SET CMP0063 NEW)
-include(CPack)
-include(FeatureSummary)
-find_package(PkgConfig)
-################# set KDE specific information #################
-find_package(ECM 0.0.8 REQUIRED NO_MODULE)
-# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-include(KDEInstallDirs)
-include(KDECMakeSettings)
-include(KDECompilerSettings)
 find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets WebEngine QuickTest)
 # build testrunner

diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fe755e9..611a19ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -1,18 +1,31 @@
1	cmake_minimum_required(VERSION 3.0)	1	cmake_minimum_required(VERSION 3.0)
2		2
3	cmake_policy(SET CMP0048 NEW)	3	project(kube VERSION 0.4)
		4
		5	set (QT_MIN_VERSION "5.7.0")
		6
		7	cmake_policy(SET CMP0011 NEW)
4	cmake_policy(SET CMP0028 NEW)	8	cmake_policy(SET CMP0028 NEW)
		9	cmake_policy(SET CMP0048 NEW)
		10	cmake_policy(SET CMP0053 NEW)
5	cmake_policy(SET CMP0063 NEW)	11	cmake_policy(SET CMP0063 NEW)
6		12
7	project(kube VERSION 0.4)	13	include(CPack)
8	set (QT_MIN_VERSION "5.7.0")	14	include(FeatureSummary)
		15	find_package(PkgConfig REQUIRED)
		16	find_package(ECM 5.29.0 REQUIRED NO_MODULE)
		17
		18	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
		19
		20	include(KDEInstallDirs)
		21	include(KDECompilerSettings)
		22	include(KDECMakeSettings NO_POLICY_SCOPE)
9		23
10	enable_testing()	24	enable_testing()
11		25
12	add_subdirectory(framework)	26	add_subdirectory(framework)
13	add_subdirectory(components)	27	add_subdirectory(components)
14	add_subdirectory(accounts)
15	add_subdirectory(icons)	28	add_subdirectory(icons)
16	add_subdirectory(applications)	29	add_subdirectory(applications)
17		30	add_subdirectory(accounts)
18	add_subdirectory(tests)	31	add_subdirectory(tests)


diff --git a/accounts/gmail/CMakeLists.txt b/accounts/gmail/CMakeLists.txt index ae98a20a..7a71264f 100644 --- a/accounts/gmail/CMakeLists.txt +++ b/accounts/gmail/CMakeLists.txt
@@ -1,24 +1,5 @@
1	project(kube-accounts-gmail)	1	project(kube-accounts-gmail)
2		2
3	cmake_minimum_required(VERSION 2.8.12)
4
5	cmake_policy(SET CMP0063 NEW)
6
7	include(CPack)
8	include(FeatureSummary)
9	find_package(PkgConfig)
10
11	################# set KDE specific information #################
12
13	find_package(ECM 0.0.8 REQUIRED NO_MODULE)
14
15	# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
16	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
17
18	include(KDEInstallDirs)
19	include(KDECMakeSettings)
20	include(KDECompilerSettings)
21
22	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)	3	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)
23		4
24	find_package(Sink CONFIG REQUIRED)	5	find_package(Sink CONFIG REQUIRED)


diff --git a/accounts/imap/CMakeLists.txt b/accounts/imap/CMakeLists.txt index 259c8e69..5ec32bbc 100644 --- a/accounts/imap/CMakeLists.txt +++ b/accounts/imap/CMakeLists.txt
@@ -1,24 +1,5 @@
1	project(kube-accounts-imap)	1	project(kube-accounts-imap)
2		2
3	cmake_minimum_required(VERSION 2.8.12)
4
5	cmake_policy(SET CMP0063 NEW)
6
7	include(CPack)
8	include(FeatureSummary)
9	find_package(PkgConfig)
10
11	################# set KDE specific information #################
12
13	find_package(ECM 0.0.8 REQUIRED NO_MODULE)
14
15	# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
16	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
17
18	include(KDEInstallDirs)
19	include(KDECMakeSettings)
20	include(KDECompilerSettings)
21
22	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Concurrent Quick Test Gui)	3	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Concurrent Quick Test Gui)
23		4
24	find_package(Sink CONFIG REQUIRED)	5	find_package(Sink CONFIG REQUIRED)


diff --git a/accounts/imap/tests/CMakeLists.txt b/accounts/imap/tests/CMakeLists.txt index 82d6059c..bf4ffe73 100644 --- a/accounts/imap/tests/CMakeLists.txt +++ b/accounts/imap/tests/CMakeLists.txt
@@ -1,5 +1,4 @@
1	include_directories(../)	1	include_directories(../)
2	cmake_policy(SET CMP0063 NEW)
3	add_executable(imapsettingstest settingstest.cpp)	2	add_executable(imapsettingstest settingstest.cpp)
4	add_test(imapsettingstest settingstest)	3	add_test(imapsettingstest settingstest)
5	target_link_libraries(imapsettingstest	4	target_link_libraries(imapsettingstest


diff --git a/accounts/kolabnow/CMakeLists.txt b/accounts/kolabnow/CMakeLists.txt index 8a178bf9..8b84d9da 100644 --- a/accounts/kolabnow/CMakeLists.txt +++ b/accounts/kolabnow/CMakeLists.txt
@@ -1,24 +1,5 @@
1	project(kube-accounts-kolabnow)	1	project(kube-accounts-kolabnow)
2		2
3	cmake_minimum_required(VERSION 2.8.12)
4
5	cmake_policy(SET CMP0063 NEW)
6
7	include(CPack)
8	include(FeatureSummary)
9	find_package(PkgConfig)
10
11	################# set KDE specific information #################
12
13	find_package(ECM 0.0.8 REQUIRED NO_MODULE)
14
15	# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
16	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
17
18	include(KDEInstallDirs)
19	include(KDECMakeSettings)
20	include(KDECompilerSettings)
21
22	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)	3	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)
23		4
24	find_package(Sink CONFIG REQUIRED)	5	find_package(Sink CONFIG REQUIRED)


diff --git a/accounts/maildir/CMakeLists.txt b/accounts/maildir/CMakeLists.txt index b321f0ad..1b017328 100644 --- a/accounts/maildir/CMakeLists.txt +++ b/accounts/maildir/CMakeLists.txt
@@ -1,24 +1,5 @@
1	project(kube-accounts-maildir)	1	project(kube-accounts-maildir)
2		2
3	cmake_minimum_required(VERSION 2.8.12)
4
5	cmake_policy(SET CMP0063 NEW)
6
7	include(CPack)
8	include(FeatureSummary)
9	find_package(PkgConfig)
10
11	################# set KDE specific information #################
12
13	find_package(ECM 0.0.8 REQUIRED NO_MODULE)
14
15	# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
16	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
17
18	include(KDEInstallDirs)
19	include(KDECMakeSettings)
20	include(KDECompilerSettings)
21
22	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Concurrent Quick Test Gui)	3	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Concurrent Quick Test Gui)
23		4
24	find_package(Sink CONFIG REQUIRED)	5	find_package(Sink CONFIG REQUIRED)


diff --git a/accounts/maildir/tests/CMakeLists.txt b/accounts/maildir/tests/CMakeLists.txt index 2452e526..3083ccc0 100644 --- a/accounts/maildir/tests/CMakeLists.txt +++ b/accounts/maildir/tests/CMakeLists.txt
@@ -1,5 +1,4 @@
1	include_directories(../)	1	include_directories(../)
2	cmake_policy(SET CMP0063 NEW)
3	add_executable(settingstest settingstest.cpp)	2	add_executable(settingstest settingstest.cpp)
4	add_test(settingstest settingstest)	3	add_test(settingstest settingstest)
5	target_link_libraries(settingstest	4	target_link_libraries(settingstest


diff --git a/applications/kube/CMakeLists.txt b/applications/kube/CMakeLists.txt index ed9942c5..2d0df2ad 100644 --- a/applications/kube/CMakeLists.txt +++ b/applications/kube/CMakeLists.txt
@@ -1,33 +1,8 @@
1	project(kube)	1	project(kube)
2		2
3	cmake_minimum_required(VERSION 2.8.12)
4	cmake_policy(SET CMP0063 NEW)
5
6	include(CPack)
7	include(FeatureSummary)
8
9	find_package(PkgConfig)
10
11	################# set KDE specific information #################
12
13	if(APPLE OR WIN32)
14	# for an ecm_add_app_icon() implementation acception svg icons
15	set(ECM_MIN_VERSION 5.29.0)
16	else()
17	set(ECM_MIN_VERSION 0.0.8)
18	endif()
19	find_package(ECM ${ECM_MIN_VERSION} REQUIRED NO_MODULE)
20
21	# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
22	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
23
24	include(KDEInstallDirs)
25	include(KDECMakeSettings)
26	include(KDECompilerSettings)
27	include(ECMAddAppIcon)	3	include(ECMAddAppIcon)
28		4
29	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets WebEngine)	5	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets WebEngine)
30
31	find_package(KF5 REQUIRED COMPONENTS Package)	6	find_package(KF5 REQUIRED COMPONENTS Package)
32		7
33	# install executable	8	# install executable


diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 8b988fab..7b06929f 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt
@@ -1,26 +1,8 @@
1	project(kube-components)	1	project(kube-components)
2		2
3	cmake_minimum_required(VERSION 2.8.12)
4
5	include(CPack)
6	include(FeatureSummary)
7	find_package(PkgConfig)
8
9	################# set KDE specific information #################
10
11	find_package(ECM 0.0.8 REQUIRED NO_MODULE)
12
13	# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
14	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
15
16	include(KDEInstallDirs)
17	include(KDECMakeSettings)
18	include(KDECompilerSettings)
19
20	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets)	3	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets)
21	find_package(KF5 REQUIRED COMPONENTS Package)	4	find_package(KF5 REQUIRED COMPONENTS Package)
22		5
23
24	macro(install_component name)	6	macro(install_component name)
25	install(DIRECTORY ${name}/contents/ui/ DESTINATION ${QML_INSTALL_DIR}/org/kube/components/${name})	7	install(DIRECTORY ${name}/contents/ui/ DESTINATION ${QML_INSTALL_DIR}/org/kube/components/${name})
26	install(FILES ${name}/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/components/${name})	8	install(FILES ${name}/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/components/${name})


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 @@
1	cmake_minimum_required(VERSION 2.8.12)
2
3
4	# ECM setup
5	find_package(ECM 0.0.10 REQUIRED NO_MODULE)
6	set(CMAKE_MODULE_PATH
7	${ECM_MODULE_PATH}
8	${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
9	${CMAKE_MODULE_PATH})
10
11	include(FeatureSummary)
12	include(GenerateExportHeader)	1	include(GenerateExportHeader)
13	include(ECMGenerateHeaders)	2	include(ECMGenerateHeaders)
14	include(ECMPackageConfigHelpers)	3	include(CMakePackageConfigHelpers)
15	include(KDEInstallDirs)
16
17	set(CMAKE_AUTOMOC ON)
18
19	enable_testing()
20		4
21	set(FRAMEWORK_INSTALL_DIR ${QML_INSTALL_DIR}/org/kube/framework)	5	set(FRAMEWORK_INSTALL_DIR ${QML_INSTALL_DIR}/org/kube/framework)
22		6


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)
9	find_package(KF5Contacts CONFIG REQUIRED)	9	find_package(KF5Contacts CONFIG REQUIRED)
10		10
11	add_definitions("-Wall -std=c++0x -g")	11	add_definitions("-Wall -std=c++0x -g")
		12	set(CMAKE_CXX_VISIBILITY_PRESET default)
12		13
13	include_directories(. domain/mime/mimetreeparser domain/ domain/mime)	14	include_directories(. domain/mime/mimetreeparser domain/ domain/mime)
14		15


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 @@
1	add_definitions("-fvisibility=default")	1	set(CMAKE_CXX_VISIBILITY_PRESET default)
2		2
3	find_package(Qt5 COMPONENTS REQUIRED Core Gui)	3	find_package(Qt5 COMPONENTS REQUIRED Core Gui)
4	find_package(KF5Mime "4.87.0" CONFIG REQUIRED)	4	find_package(KF5Mime "4.87.0" CONFIG REQUIRED)
5	find_package(QGpgme CONFIG REQUIRED)	5	find_package(QGpgme CONFIG REQUIRED)
6	find_package(KF5Codecs CONFIG REQUIRED)	6	find_package(KF5Codecs CONFIG REQUIRED)
7	find_package(ECM 1.0.0 REQUIRED NO_MODULE)
8	set(CMAKE_MODULE_PATH	7	set(CMAKE_MODULE_PATH
9	${ECM_MODULE_PATH}	8	${ECM_MODULE_PATH}
10	${CMAKE_CURRENT_SOURCE_DIR}	9	${CMAKE_CURRENT_SOURCE_DIR}
11	${CMAKE_MODULE_PATH})	10	${CMAKE_MODULE_PATH})
12		11
13	#add_definitions(-DTRANSLATION_DOMAIN=\"libmimetreeparser\")
14
15	# target_include_directories does not handle empty include paths	12	# target_include_directories does not handle empty include paths
16	include_directories(${GPGME_INCLUDES})	13	include_directories(${GPGME_INCLUDES})
17		14


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(
5	${CMAKE_CURRENT_SOURCE_DIR}/..	5	${CMAKE_CURRENT_SOURCE_DIR}/..
6	)	6	)
7		7
8	include(ECMAddTests)
9	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Test WebEngine)	8	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Test WebEngine)
10		9
11	include( ${CMAKE_SOURCE_DIR}/cmake/modules/add_gpg_crypto_test.cmake )	10	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 @@
1	include_directories(${CMAKE_CURRENT_BINARY_DIR})	1	include_directories(${CMAKE_CURRENT_BINARY_DIR})
2	cmake_policy(SET CMP0063 NEW)
3	add_executable(sinkactiontest sinkactiontest.cpp)	2	add_executable(sinkactiontest sinkactiontest.cpp)
4	add_test(sinkactiontest sinkactiontest)	3	add_test(sinkactiontest sinkactiontest)
5	target_link_libraries(sinkactiontest	4	target_link_libraries(sinkactiontest


diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f18ebc09..0515c052 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt
@@ -1,23 +1,5 @@
1	project(tests)	1	project(tests)
2		2
3	cmake_minimum_required(VERSION 2.8.12)
4	cmake_policy(SET CMP0063 NEW)
5
6	include(CPack)
7	include(FeatureSummary)
8	find_package(PkgConfig)
9
10	################# set KDE specific information #################
11
12	find_package(ECM 0.0.8 REQUIRED NO_MODULE)
13
14	# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
15	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
16
17	include(KDEInstallDirs)
18	include(KDECMakeSettings)
19	include(KDECompilerSettings)
20
21	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets WebEngine QuickTest)	3	find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets WebEngine QuickTest)
22		4
23	# build testrunner	5	# build testrunner