diff options
Diffstat (limited to 'framework/src')
5 files changed, 6 insertions, 11 deletions
diff --git a/framework/src/CMakeLists.txt b/framework/src/CMakeLists.txt index 8ba924fe..d80fe284 100644 --- a/framework/src/CMakeLists.txt +++ b/framework/src/CMakeLists.txt | |||
@@ -72,7 +72,6 @@ target_link_libraries(kubeframework | |||
72 | KF5::Codecs | 72 | KF5::Codecs |
73 | KF5::Contacts | 73 | KF5::Contacts |
74 | KAsync | 74 | KAsync |
75 | ${GPGME_LIBRARIES} | ||
76 | ) | 75 | ) |
77 | install(TARGETS kubeframework DESTINATION ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) | 76 | install(TARGETS kubeframework DESTINATION ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) |
78 | 77 | ||
diff --git a/framework/src/domain/mime/CMakeLists.txt b/framework/src/domain/mime/CMakeLists.txt index 134bf8f0..9b4da136 100644 --- a/framework/src/domain/mime/CMakeLists.txt +++ b/framework/src/domain/mime/CMakeLists.txt | |||
@@ -5,5 +5,5 @@ add_library(mailcrypto STATIC | |||
5 | target_link_libraries(mailcrypto | 5 | target_link_libraries(mailcrypto |
6 | Qt5::Core | 6 | Qt5::Core |
7 | KF5::Mime | 7 | KF5::Mime |
8 | ${GPGME_LIBRARIES} | 8 | gpgme |
9 | ) | 9 | ) |
diff --git a/framework/src/domain/mime/mimetreeparser/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/CMakeLists.txt index f9452f3c..e3979a8e 100644 --- a/framework/src/domain/mime/mimetreeparser/CMakeLists.txt +++ b/framework/src/domain/mime/mimetreeparser/CMakeLists.txt | |||
@@ -5,9 +5,6 @@ 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 | # target_include_directories does not handle empty include paths | ||
9 | include_directories(${GPGME_INCLUDES}) | ||
10 | |||
11 | set(libmimetreeparser_SRCS | 8 | set(libmimetreeparser_SRCS |
12 | objecttreeparser.cpp | 9 | objecttreeparser.cpp |
13 | 10 | ||
@@ -47,10 +44,10 @@ target_link_libraries(kube_otp | |||
47 | 44 | ||
48 | target_link_libraries(kube_otp | 45 | target_link_libraries(kube_otp |
49 | PRIVATE | 46 | PRIVATE |
50 | ${GPGME_LIBRARIES} | ||
51 | mailcrypto | 47 | mailcrypto |
52 | KF5::Codecs | 48 | KF5::Codecs |
53 | Qt5::Gui | 49 | Qt5::Gui |
50 | gpgme | ||
54 | ) | 51 | ) |
55 | 52 | ||
56 | add_subdirectory(autotests) | 53 | add_subdirectory(autotests) |
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt index 55bc4647..7c8e2f3c 100644 --- a/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt +++ b/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt | |||
@@ -15,7 +15,7 @@ macro(add_mimetreeparser_unittest _source) | |||
15 | ecm_add_test(${_source} util.cpp setupenv.cpp | 15 | ecm_add_test(${_source} util.cpp setupenv.cpp |
16 | TEST_NAME ${_name} | 16 | TEST_NAME ${_name} |
17 | NAME_PREFIX "mimetreeparser-" | 17 | NAME_PREFIX "mimetreeparser-" |
18 | LINK_LIBRARIES kube_otp Qt5::Test KF5::Mime ${GPGME_LIBRARIES} | 18 | LINK_LIBRARIES kube_otp Qt5::Test KF5::Mime |
19 | ) | 19 | ) |
20 | endmacro () | 20 | endmacro () |
21 | 21 | ||
@@ -24,7 +24,7 @@ macro(add_mimetreeparser_class_unittest _source _additionalSource) | |||
24 | ecm_add_test(${_source} ${_additionalSource} | 24 | ecm_add_test(${_source} ${_additionalSource} |
25 | TEST_NAME ${_name} | 25 | TEST_NAME ${_name} |
26 | NAME_PREFIX "mimetreeparser-" | 26 | NAME_PREFIX "mimetreeparser-" |
27 | LINK_LIBRARIES kube_otp Qt5::Test KF5::Mime ${GPGME_LIBRARIES} | 27 | LINK_LIBRARIES kube_otp Qt5::Test KF5::Mime |
28 | ) | 28 | ) |
29 | endmacro () | 29 | endmacro () |
30 | 30 | ||
@@ -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_LIBRARIES} | 40 | 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 ee52fa2a..b674320c 100644 --- a/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt +++ b/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt | |||
@@ -15,11 +15,10 @@ target_link_libraries(mimetreeparsertest | |||
15 | Qt5::Core | 15 | Qt5::Core |
16 | Qt5::Test | 16 | Qt5::Test |
17 | KF5::Mime | 17 | KF5::Mime |
18 | ${GPGME_LIBRARIES} | ||
19 | ) | 18 | ) |
20 | 19 | ||
21 | ecm_add_test(gpgerrortest.cpp | 20 | ecm_add_test(gpgerrortest.cpp |
22 | TEST_NAME "gpgerrortest" | 21 | TEST_NAME "gpgerrortest" |
23 | NAME_PREFIX "mimetreeparser-" | 22 | NAME_PREFIX "mimetreeparser-" |
24 | LINK_LIBRARIES Qt5::Core Qt5::Test kube_otp ${GPGME_LIBRARIES} | 23 | LINK_LIBRARIES Qt5::Core Qt5::Test kube_otp gpgme |
25 | ) | 24 | ) |