From 5d1d7b2def3553f181c791ad1f6107b66d9d789f Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 8 May 2018 10:29:53 +0200
Subject: Use a Gpgpme::Gpgpme style exported target

---
 cmake/modules/FindGpgme.cmake                                  | 10 ++++++----
 framework/src/domain/mime/CMakeLists.txt                       |  3 ++-
 framework/src/domain/mime/mimetreeparser/CMakeLists.txt        |  6 ++----
 .../src/domain/mime/mimetreeparser/autotests/CMakeLists.txt    |  2 +-
 framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt  |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/cmake/modules/FindGpgme.cmake b/cmake/modules/FindGpgme.cmake
index cb1b19b7..41065fc9 100644
--- a/cmake/modules/FindGpgme.cmake
+++ b/cmake/modules/FindGpgme.cmake
@@ -11,8 +11,10 @@ mark_as_advanced(GPGME_INCLUDE_DIR GPGME_LIBRARY GPGME_INCLUDE_DIR GPGME_LIBRARY
 set(GPGME_LIBRARIES ${GPGME_LIBRARY} ${GPGERROR_LIBRARY})
 set(GPGME_INCLUDE_DIRS ${GPGME_INCLUDE_DIR} ${GPGERROR_INCLUDE_DIR})
 
-if (NOT ${gpgme})
-    add_library(gpgme INTERFACE)
-    target_link_libraries(gpgme INTERFACE ${GPGME_LIBRARIES})
-    target_include_directories(gpgme INTERFACE ${GPGME_INCLUDE_DIRS})
+if (GPGME_FOUND AND NOT TARGET Gpgme::Gpgme)
+    add_library(Gpgme::Gpgme INTERFACE IMPORTED)
+    set_target_properties(Gpgme::Gpgme PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES  "${GPGME_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${GPGME_LIBRARIES}"
+        )
 endif()
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
     crypto.cpp
 )
 target_link_libraries(mailcrypto
+    PUBLIC
     Qt5::Core
     KF5::Mime
-    gpgme
+    Gpgme::Gpgme
 )
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)
 find_package(KF5Codecs CONFIG REQUIRED)
 find_package(Gpgme REQUIRED)
 
-set(libmimetreeparser_SRCS
+add_library(kube_otp STATIC
     objecttreeparser.cpp
 
     #Bodyformatter
@@ -35,8 +35,6 @@ set(libmimetreeparser_SRCS
     util.cpp
     )
 
-add_library(kube_otp STATIC ${libmimetreeparser_SRCS})
-
 target_link_libraries(kube_otp
     PUBLIC
     KF5::Mime
@@ -47,7 +45,7 @@ target_link_libraries(kube_otp
     mailcrypto
     KF5::Codecs
     Qt5::Gui
-    gpgme
+    Gpgme::Gpgme
 )
 
 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)
         kube_otp
         Qt5::Test
         KF5::Mime
-        gpgme
+        Gpgme::Gpgme
     )
     add_gpg_crypto_test(${_name} mimetreeparser-${_name})
 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
 ecm_add_test(gpgerrortest.cpp
     TEST_NAME "gpgerrortest"
     NAME_PREFIX "mimetreeparser-"
-    LINK_LIBRARIES Qt5::Core Qt5::Test kube_otp gpgme
+    LINK_LIBRARIES Qt5::Core Qt5::Test kube_otp Gpgme::Gpgme
 )
-- 
cgit v1.2.3