diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-05-08 10:29:53 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-05-08 10:29:53 +0200 |
commit | 5d1d7b2def3553f181c791ad1f6107b66d9d789f (patch) | |
tree | 211715be3b4d047ef8faff7fef3bc4cdc79bd775 /framework/src | |
parent | 2940dd75d550270d369bdf41418268d5956060b8 (diff) | |
download | kube-5d1d7b2def3553f181c791ad1f6107b66d9d789f.tar.gz kube-5d1d7b2def3553f181c791ad1f6107b66d9d789f.zip |
Use a Gpgpme::Gpgpme style exported target
Diffstat (limited to 'framework/src')
4 files changed, 6 insertions, 7 deletions
diff --git a/framework/src/domain/mime/CMakeLists.txt b/framework/src/domain/mime/CMakeLists.txt index 9b4da136..81358f76 100644 --- a/framework/src/domain/mime/CMakeLists.txt +++ b/framework/src/domain/mime/CMakeLists.txt | |||
@@ -3,7 +3,8 @@ add_library(mailcrypto STATIC | |||
3 | crypto.cpp | 3 | crypto.cpp |
4 | ) | 4 | ) |
5 | target_link_libraries(mailcrypto | 5 | target_link_libraries(mailcrypto |
6 | PUBLIC | ||
6 | Qt5::Core | 7 | Qt5::Core |
7 | KF5::Mime | 8 | KF5::Mime |
8 | gpgme | 9 | Gpgme::Gpgme |
9 | ) | 10 | ) |
diff --git a/framework/src/domain/mime/mimetreeparser/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/CMakeLists.txt index e3979a8e..0a0297f4 100644 --- a/framework/src/domain/mime/mimetreeparser/CMakeLists.txt +++ b/framework/src/domain/mime/mimetreeparser/CMakeLists.txt | |||
@@ -5,7 +5,7 @@ find_package(KF5Mime 4.87.0 CONFIG REQUIRED) | |||
5 | find_package(KF5Codecs CONFIG REQUIRED) | 5 | find_package(KF5Codecs CONFIG REQUIRED) |
6 | find_package(Gpgme REQUIRED) | 6 | find_package(Gpgme REQUIRED) |
7 | 7 | ||
8 | set(libmimetreeparser_SRCS | 8 | add_library(kube_otp STATIC |
9 | objecttreeparser.cpp | 9 | objecttreeparser.cpp |
10 | 10 | ||
11 | #Bodyformatter | 11 | #Bodyformatter |
@@ -35,8 +35,6 @@ set(libmimetreeparser_SRCS | |||
35 | util.cpp | 35 | util.cpp |
36 | ) | 36 | ) |
37 | 37 | ||
38 | add_library(kube_otp STATIC ${libmimetreeparser_SRCS}) | ||
39 | |||
40 | target_link_libraries(kube_otp | 38 | target_link_libraries(kube_otp |
41 | PUBLIC | 39 | PUBLIC |
42 | KF5::Mime | 40 | KF5::Mime |
@@ -47,7 +45,7 @@ target_link_libraries(kube_otp | |||
47 | mailcrypto | 45 | mailcrypto |
48 | KF5::Codecs | 46 | KF5::Codecs |
49 | Qt5::Gui | 47 | Qt5::Gui |
50 | gpgme | 48 | Gpgme::Gpgme |
51 | ) | 49 | ) |
52 | 50 | ||
53 | add_subdirectory(autotests) | 51 | add_subdirectory(autotests) |
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt index 7c8e2f3c..b992a4a2 100644 --- a/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt +++ b/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt | |||
@@ -37,7 +37,7 @@ macro(add_mimetreeparser_crypto_unittest _source) | |||
37 | kube_otp | 37 | kube_otp |
38 | Qt5::Test | 38 | Qt5::Test |
39 | KF5::Mime | 39 | KF5::Mime |
40 | gpgme | 40 | Gpgme::Gpgme |
41 | ) | 41 | ) |
42 | add_gpg_crypto_test(${_name} mimetreeparser-${_name}) | 42 | add_gpg_crypto_test(${_name} mimetreeparser-${_name}) |
43 | endmacro () | 43 | endmacro () |
diff --git a/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt index b674320c..82022da4 100644 --- a/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt +++ b/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt | |||
@@ -20,5 +20,5 @@ target_link_libraries(mimetreeparsertest | |||
20 | ecm_add_test(gpgerrortest.cpp | 20 | ecm_add_test(gpgerrortest.cpp |
21 | TEST_NAME "gpgerrortest" | 21 | TEST_NAME "gpgerrortest" |
22 | NAME_PREFIX "mimetreeparser-" | 22 | NAME_PREFIX "mimetreeparser-" |
23 | LINK_LIBRARIES Qt5::Core Qt5::Test kube_otp gpgme | 23 | LINK_LIBRARIES Qt5::Core Qt5::Test kube_otp Gpgme::Gpgme |
24 | ) | 24 | ) |