cmake fixes

8 files changed, 12 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 195fabc2..dd5a92b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 
 cmake_policy(SET CMP0048 NEW)
 cmake_policy(SET CMP0028 NEW)
+cmake_policy(SET CMP0063 NEW)
 
 project(kube VERSION 0.1.0)
 
diff --git a/accounts/gmail/CMakeLists.txt b/accounts/gmail/CMakeLists.txt
index f75cf388..9eea5702 100644
--- a/accounts/gmail/CMakeLists.txt
+++ b/accounts/gmail/CMakeLists.txt
@@ -2,6 +2,8 @@ project(kube-accounts-gmail)
 
 cmake_minimum_required(VERSION 2.8.12)
 
+cmake_policy(SET CMP0063 NEW)
+
 include(CPack)
 include(FeatureSummary)
 find_package(PkgConfig)
diff --git a/accounts/imap/CMakeLists.txt b/accounts/imap/CMakeLists.txt
index 42b50899..a6fb6b10 100644
--- a/accounts/imap/CMakeLists.txt
+++ b/accounts/imap/CMakeLists.txt
@@ -2,6 +2,8 @@ project(kube-accounts-imap)
 
 cmake_minimum_required(VERSION 2.8.12)
 
+cmake_policy(SET CMP0063 NEW)
+
 include(CPack)
 include(FeatureSummary)
 find_package(PkgConfig)
diff --git a/accounts/kolabnow/CMakeLists.txt b/accounts/kolabnow/CMakeLists.txt
index c8a2481f..e2d6f3db 100644
--- a/accounts/kolabnow/CMakeLists.txt
+++ b/accounts/kolabnow/CMakeLists.txt
@@ -2,6 +2,8 @@ project(kube-accounts-kolabnow)
 
 cmake_minimum_required(VERSION 2.8.12)
 
+cmake_policy(SET CMP0063 NEW)
+
 include(CPack)
 include(FeatureSummary)
 find_package(PkgConfig)
diff --git a/accounts/maildir/CMakeLists.txt b/accounts/maildir/CMakeLists.txt
index e50d4179..8791e37e 100644
--- a/accounts/maildir/CMakeLists.txt
+++ b/accounts/maildir/CMakeLists.txt
@@ -2,6 +2,8 @@ project(kube-accounts-maildir)
 
 cmake_minimum_required(VERSION 2.8.12)
 
+cmake_policy(SET CMP0063 NEW)
+
 include(CPack)
 include(FeatureSummary)
 find_package(PkgConfig)
diff --git a/applications/mail/CMakeLists.txt b/applications/mail/CMakeLists.txt
index 7c6fe755..af343f6e 100644
--- a/applications/mail/CMakeLists.txt
+++ b/applications/mail/CMakeLists.txt
@@ -27,6 +27,7 @@ find_package(KF5 REQUIRED COMPONENTS Package)
 add_executable(${PROJECT_NAME} main.cpp)
 qt5_use_modules(${PROJECT_NAME} Gui Quick Widgets WebEngine)
 target_link_libraries(${PROJECT_NAME} KF5::Package)
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${kube_VERSION})
 
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 84b0fa05..882d25b0 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -27,7 +27,7 @@ macro(install_component name)
     install(DIRECTORY ${name}/contents/ui/ DESTINATION ${QML_INSTALL_DIR}/org/kube/components/${name})
     install(FILES ${name}/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/components/${name})
     kpackage_install_package(${name} org.kube.components.${name} "genericqml")
-endmacro(auto_tests)
+endmacro(install_component)
 
 install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/components)
 install(DIRECTORY package/contents/ui/ DESTINATION ${QML_INSTALL_DIR}/org/kube/components)
diff --git a/framework/domain/mimetreeparser/tests/CMakeLists.txt b/framework/domain/mimetreeparser/tests/CMakeLists.txt
index a23f639c..71afb903 100644
--- a/framework/domain/mimetreeparser/tests/CMakeLists.txt
+++ b/framework/domain/mimetreeparser/tests/CMakeLists.txt
@@ -14,7 +14,7 @@ qt5_use_modules(mimetreeparsertest Core Test)
 target_link_libraries(mimetreeparsertest mimetreeparser)
 
 find_package(Gpgmepp 1.7.1 CONFIG)
-find_package(QGpgME 1.7.1 CONFIG)
+find_package(QGpgme 1.7.1 CONFIG)
 
 ecm_add_test(gpgerrortest.cpp
     TEST_NAME "gpgerrortest"