Changeset View
Changeset View
Standalone View
Standalone View
CMakeLists.txt
Show All 35 Lines | |||||
36 | set(VERSION_RELEASE "0") | 36 | set(VERSION_RELEASE "0") | ||
37 | set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}) | 37 | set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}) | ||
38 | set(SOVERSION "8") | 38 | set(SOVERSION "8") | ||
39 | add_definitions(-D'VERSION="${VERSION}"') #" | 39 | add_definitions(-D'VERSION="${VERSION}"') #" | ||
40 | 40 | | |||
41 | set(CMAKE_CXX_STANDARD 14) | 41 | set(CMAKE_CXX_STANDARD 14) | ||
42 | set(CMAKE_CXX_STANDARD_REQUIRED ON) | 42 | set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||
43 | 43 | | |||
44 | find_package(PolkitQt-1 REQUIRED) | ||||
stikonas: move this bwllow line 46:
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}… | |||||
44 | find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) | 45 | find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) | ||
45 | set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/") | 46 | set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/") | ||
46 | 47 | | |||
We actually already set module path in the line above, so this is redundant. Remove this line. stikonas: We actually already set module path in the line above, so this is redundant. Remove this line. | |||||
48 | include_directories(${POLKITQT-1_INCLUDE_DIR}) | ||||
49 | | ||||
This is no longer necessary after we link to PolkitQt5-1 instead of PolkitQt-1 stikonas: This is no longer necessary after we link to PolkitQt5-1 instead of PolkitQt-1 | |||||
47 | include(KDEInstallDirs) | 50 | include(KDEInstallDirs) | ||
48 | include(KDECMakeSettings) | 51 | include(KDECMakeSettings) | ||
49 | include(KDECompilerSettings NO_POLICY_SCOPE) | 52 | include(KDECompilerSettings NO_POLICY_SCOPE) | ||
50 | include(FeatureSummary) | 53 | include(FeatureSummary) | ||
51 | include(GenerateExportHeader) | 54 | include(GenerateExportHeader) | ||
52 | include(ECMSetupVersion) | 55 | include(ECMSetupVersion) | ||
53 | 56 | | |||
54 | ecm_setup_version(${VERSION} VARIABLE_PREFIX KPMCORE | 57 | ecm_setup_version(${VERSION} VARIABLE_PREFIX KPMCORE | ||
55 | VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kpmcore_version.h" | 58 | VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kpmcore_version.h" | ||
56 | PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPMcoreConfigVersion.cmake" | 59 | PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPMcoreConfigVersion.cmake" | ||
57 | SOVERSION ${SOVERSION}) | 60 | SOVERSION ${SOVERSION}) | ||
58 | 61 | | |||
59 | find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS | 62 | find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS | ||
60 | Core | 63 | Core | ||
61 | DBus | 64 | DBus | ||
62 | Gui | 65 | Gui | ||
63 | Widgets | 66 | Widgets | ||
64 | ) | 67 | ) | ||
65 | 68 | | |||
66 | # Load the frameworks we need | 69 | # Load the frameworks we need | ||
67 | find_package(KF5 ${KF5_MIN_VERSION} REQUIRED | 70 | find_package(KF5 ${KF5_MIN_VERSION} REQUIRED | ||
68 | Auth | 71 | Auth | ||
69 | CoreAddons | 72 | CoreAddons | ||
70 | I18n | 73 | I18n | ||
71 | WidgetsAddons | 74 | WidgetsAddons | ||
Do this one separately, it's not KF5 frameworks. find_package(PolkitQt5-1 REQUIRED) You might also need if compilation fails stikonas: Do this one separately, it's not KF5 frameworks.
`find_package(PolkitQt5-1 REQUIRED)`
You… | |||||
72 | ) | 75 | ) | ||
73 | 76 | | |||
74 | find_package(Qca-qt5 REQUIRED) | 77 | find_package(Qca-qt5 REQUIRED) | ||
75 | 78 | | |||
76 | # use sane compile flags | 79 | # use sane compile flags | ||
77 | add_definitions( | 80 | add_definitions( | ||
78 | -DQT_USE_QSTRINGBUILDER | 81 | -DQT_USE_QSTRINGBUILDER | ||
79 | -DQT_NO_CAST_TO_ASCII | 82 | -DQT_NO_CAST_TO_ASCII | ||
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines |
move this bwllow line 46:
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)