diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-01-21 11:36:43 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-01-21 11:36:43 +0100 |
commit | bf96cfa0d75d256e036c76ec64f0f456014f2739 (patch) | |
tree | 3ab0ff603dfccb9f28040af3a1559b01af09aa3f /framework/CMakeLists.txt | |
parent | e4e11ba46f4ccce5f9ca63ab758a132d945061e8 (diff) | |
parent | 9a3059769a0bf9dbf81e523c9245d2aa98420bb5 (diff) | |
download | kube-bf96cfa0d75d256e036c76ec64f0f456014f2739.tar.gz kube-bf96cfa0d75d256e036c76ec64f0f456014f2739.zip |
Merge remote-tracking branch 'origin/dev/libotp' into develop
Conflicts:
framework/mail/CMakeLists.txt
Diffstat (limited to 'framework/CMakeLists.txt')
-rw-r--r-- | framework/CMakeLists.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt index d59061d2..0b2b505d 100644 --- a/framework/CMakeLists.txt +++ b/framework/CMakeLists.txt | |||
@@ -16,12 +16,22 @@ include(KDEInstallDirs) | |||
16 | 16 | ||
17 | find_package(Qt5 COMPONENTS REQUIRED Core Qml) | 17 | find_package(Qt5 COMPONENTS REQUIRED Core Qml) |
18 | 18 | ||
19 | find_package(KF5Otp "5.1.42" CONFIG REQUIRED) | ||
20 | find_package(KF5Mime "4.87.0" CONFIG REQUIRED) | ||
21 | find_package(Akonadi2Common CONFIG REQUIRED) | ||
22 | find_package(KF5Async) | ||
23 | find_package(KF5Libkleo) | ||
24 | |||
19 | set(CMAKE_AUTOMOC ON) | 25 | set(CMAKE_AUTOMOC ON) |
20 | add_definitions("-Wall -std=c++0x -g") | 26 | add_definitions("-Wall -std=c++0x -g") |
21 | include_directories(.) | 27 | include_directories(.) |
22 | include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/common) | 28 | include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/common) |
23 | include_directories(SYSTEM /work/install/include/) | 29 | include_directories(SYSTEM /work/install/include/) |
24 | include_directories(SYSTEM /work/install/include/KF5/) | 30 | include_directories(SYSTEM /work/install/include/KF5/) |
31 | include_directories(SYSTEM /work/install/include/KF5/KIconThemes) | ||
32 | include_directories(SYSTEM /work/install/include/KF5/KMime) | ||
33 | include_directories(SYSTEM /work/install/include/KF5/KService) | ||
34 | include_directories(SYSTEM /work/install/include/KF5/KCoreAddons) | ||
25 | 35 | ||
26 | enable_testing() | 36 | enable_testing() |
27 | 37 | ||