summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-09-09 22:33:08 +0200
committerMontel Laurent <[email protected]>2015-09-09 22:34:08 +0200
commit9c1b119383b88f3c994f04030949d9f4ccbeda2e (patch)
treebed2e336cb39fd928795f104e5ad74227ce76105
parent6679272e2a4dc33b6e86d197429f7636b54a57f3 (diff)
Clean up. Add missing file
-rw-r--r--grantleetheme/CMakeLists.txt9
-rw-r--r--grantleetheme/KF5GrantleeThemeConfig.cmake.in3
-rw-r--r--grantleetheme/src/CMakeLists.txt1
3 files changed, 5 insertions, 8 deletions
diff --git a/grantleetheme/CMakeLists.txt b/grantleetheme/CMakeLists.txt
index be3afa9..186367e 100644
--- a/grantleetheme/CMakeLists.txt
+++ b/grantleetheme/CMakeLists.txt
@@ -22,16 +22,12 @@ include(ECMAddTests)
set(KF5_VERSION "5.14.0")
-set(KDEPIMLIBS_LIB_VERSION "5.0.42")
set(KDEPIM_LIB_VERSION "5.43.0")
set(QT_REQUIRED_VERSION "5.4.0")
-set(KMIME_LIB_VERSION "4.87.0")
-find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiTools)
+find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Network)
find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
-find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5NewStuff ${KF5_VERSION} CONFIG REQUIRED)
ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX GRANTHEETHEME
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/grantleetheme_version.h"
@@ -41,7 +37,6 @@ ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX GRANTHEETHEME
########### Targets ###########
-add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
########### CMake Config Files ###########
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5GrantleeTheme")
diff --git a/grantleetheme/KF5GrantleeThemeConfig.cmake.in b/grantleetheme/KF5GrantleeThemeConfig.cmake.in
new file mode 100644
index 0000000..fc5e7b6
--- /dev/null
+++ b/grantleetheme/KF5GrantleeThemeConfig.cmake.in
@@ -0,0 +1,3 @@
+
+include("${CMAKE_CURRENT_LIST_DIR}/KF5MailImporterTargets.cmake")
diff --git a/grantleetheme/src/CMakeLists.txt b/grantleetheme/src/CMakeLists.txt
index 683a1ad..d28459b 100644
--- a/grantleetheme/src/CMakeLists.txt
+++ b/grantleetheme/src/CMakeLists.txt
@@ -40,7 +40,6 @@ ecm_generate_headers(GrantleeTheme_CamelCase_HEADERS
HEADER_NAMES
GrantleeThemeManager
GrantleeTheme
- #Theme
REQUIRED_HEADERS GrantleeTheme_HEADERS
PREFIX GrantleeTheme
)