blob: 7b7daae11eaca246a90e92364915f7bbb59dcd65 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
From 7c155671b5ea1a7ed1244510e79e094fc6f8ff4e Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Mon, 2 Apr 2018 21:27:52 +0200
Subject: [PATCH] Cleanup CMakeLists.txt
Summary:
Cleanup duplicate find Qt5 and move all below #Dependencies block.
Sort dependencies.
KF5Sane is not an actual framework, so separate it from KF5 modules.
Make use of FeatureSummary
Reviewers: sars
Reviewed By: sars
Subscribers: ltoscano
Differential Revision: https://phabricator.kde.org/D11861
---
CMakeLists.txt | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c23351..6b326df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,44 +17,40 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
include(GenerateExportHeader)
-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
-
# be not so strict with the poor developer who just wants to use strings
remove_definitions(-DQT_NO_URL_CAST_FROM_STRING)
remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
-set(KF5_VERSION "5.1.0")
+set(REQUIRED_QT_VERSION "5.2.0")
+set(KF5_MIN_VERSION "5.1.0")
ecm_setup_version(
- ${KF5_VERSION}
+ ${KF5_MIN_VERSION}
VARIABLE_PREFIX SKANLITE
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/skanlite_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/src/version.h.cmake"
)
+set(SKANLITE_VERSION_STRING "2.1.0.1")
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
+
# Dependencies
-set(REQUIRED_QT_VERSION "5.2.0")
+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
-# Required Qt5 components to build this framework
-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core)
find_package(PNG REQUIRED)
-
include_directories(${PNG_INCLUDE_DIRS})
-set(SKANLITE_VERSION_STRING "2.1.0.1")
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
-
-find_package(KF5 ${KF5_VERSION} REQUIRED
- COMPONENTS # alias to find_package(KFGuiAddons ${KF5_VERSION} REQUIRED)
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
CoreAddons # KAboutData
+ DocTools # yields kdoctools_create_handbook
I18n
- XmlGui # KAboutApplicationDialog
KIO # contains the KIOWidgets which we use in target_link_libraries
- DocTools # yields kdoctools_create_handbook
- Sane # will find KF5Sane
+ XmlGui # KAboutApplicationDialog
)
+find_package(KF5Sane ${KF5_MIN_VERSION} REQUIRED)
+
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
# Subdirectories
@@ -62,6 +58,8 @@ add_subdirectory(src)
add_subdirectory(doc)
add_subdirectory(autotests)
add_subdirectory(tests)
+
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
find_package(KF5I18n CONFIG REQUIRED)
ki18n_install(po)
--
2.16.3
|
GitWeb