diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-08-23 18:39:44 -0600 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-08-23 18:39:44 -0600 |
commit | 85dc437da27417cce05b5a9f97505b43cfdf4dee (patch) | |
tree | 3b6984e9f42a085fae821d4024326987a48fdc98 /accounts | |
parent | 25b4f6e2d7ed2d783b8ee1eefbe62df713ca0341 (diff) | |
download | kube-85dc437da27417cce05b5a9f97505b43cfdf4dee.tar.gz kube-85dc437da27417cce05b5a9f97505b43cfdf4dee.zip |
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.
Diffstat (limited to 'accounts')
-rw-r--r-- | accounts/gmail/CMakeLists.txt | 19 | ||||
-rw-r--r-- | accounts/imap/CMakeLists.txt | 19 | ||||
-rw-r--r-- | accounts/imap/tests/CMakeLists.txt | 1 | ||||
-rw-r--r-- | accounts/kolabnow/CMakeLists.txt | 19 | ||||
-rw-r--r-- | accounts/maildir/CMakeLists.txt | 19 | ||||
-rw-r--r-- | accounts/maildir/tests/CMakeLists.txt | 1 |
6 files changed, 0 insertions, 78 deletions
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 |