Changeset View
Standalone View
CMakeLists.txt
1 | cmake_minimum_required(VERSION 3.0) | 1 | cmake_minimum_required(VERSION 3.0) | ||
---|---|---|---|---|---|
2 | 2 | | |||
3 | # KDE Application Version, managed by release script | 3 | # KDE Application Version, managed by release script | ||
4 | set (KDE_APPLICATIONS_VERSION_MAJOR "19") | 4 | set (KDE_APPLICATIONS_VERSION_MAJOR "19") | ||
5 | set (KDE_APPLICATIONS_VERSION_MINOR "03") | 5 | set (KDE_APPLICATIONS_VERSION_MINOR "03") | ||
6 | set (KDE_APPLICATIONS_VERSION_MICRO "70") | 6 | set (KDE_APPLICATIONS_VERSION_MICRO "70") | ||
7 | set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") | 7 | set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") | ||
8 | 8 | | |||
9 | project(okular VERSION 1.6.${KDE_APPLICATIONS_VERSION_MICRO}) | 9 | project(okular VERSION 1.6.${KDE_APPLICATIONS_VERSION_MICRO}) | ||
10 | 10 | | |||
11 | set(QT_REQUIRED_VERSION "5.8.0") | 11 | set(QT_REQUIRED_VERSION "5.8.0") | ||
12 | set(KF5_REQUIRED_VERSION "5.44.0") | 12 | set(KF5_REQUIRED_VERSION "5.56.0") | ||
aacid: I don't like this.
If you need a new kirigami or something make a vesion check and then enable… | |||||
I'm not very familiar with cmake. That about creating a separate patch with the placeholder text and the bottom margin improvement and wait until Okular depends on 5.56 to land the rest (the clear button)? ognarb: I'm not very familiar with cmake. That about creating a separate patch with the placeholder… | |||||
13 | 13 | | |||
I would prefer if you left the required version to be 5.44.0 for everything and then inside the if (BUILD_OKULARKIRIGAMI) below you check ${KF5_VERSION} and if it's smaller than 5.56.0 you give a MESSAGE with FATAL_ERROR saying something "You need KF5 version XXX to compile the trouch friendly frontend, if you're not interested in it pass -DSTUFF=OFF to disable it to cmake" or something like that. Because with your current version it's kind of impossible to know one can disable the kirigami frontend to lower the KF5 requirement (one basically has to read the CMakeLists.txt file) Do I make sense? aacid: I would prefer if you left the required version to be 5.44.0 for everything and then inside the… | |||||
14 | find_package(ECM 5.33.0 CONFIG REQUIRED) | 14 | find_package(ECM 5.33.0 CONFIG REQUIRED) | ||
15 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) | 15 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) | ||
16 | 16 | | |||
17 | include(ECMInstallIcons) | 17 | include(ECMInstallIcons) | ||
18 | include(ECMSetupVersion) | 18 | include(ECMSetupVersion) | ||
19 | include(ECMOptionalAddSubdirectory) | 19 | include(ECMOptionalAddSubdirectory) | ||
20 | include(GenerateExportHeader) | 20 | include(GenerateExportHeader) | ||
21 | include(FeatureSummary) | 21 | include(FeatureSummary) | ||
▲ Show 20 Lines • Show All 99 Lines • ▼ Show 20 Line(s) | |||||
121 | add_definitions(-DQT_USE_FAST_OPERATOR_PLUS) | 121 | add_definitions(-DQT_USE_FAST_OPERATOR_PLUS) | ||
122 | add_definitions(-DTRANSLATION_DOMAIN="okular") | 122 | add_definitions(-DTRANSLATION_DOMAIN="okular") | ||
123 | add_definitions(-DQT_NO_URL_CAST_FROM_STRING) | 123 | add_definitions(-DQT_NO_URL_CAST_FROM_STRING) | ||
124 | 124 | | |||
125 | include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PHONON_INCLUDES} core/synctex ${ZLIB_INCLUDE_DIR} ${CMAKE_BINARY_DIR}/core) | 125 | include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PHONON_INCLUDES} core/synctex ${ZLIB_INCLUDE_DIR} ${CMAKE_BINARY_DIR}/core) | ||
126 | 126 | | |||
127 | option(BUILD_OKULARKIRIGAMI "Builds the touch-friendly frontend" ON) | 127 | option(BUILD_OKULARKIRIGAMI "Builds the touch-friendly frontend" ON) | ||
128 | if (BUILD_OKULARKIRIGAMI) | 128 | if (BUILD_OKULARKIRIGAMI) | ||
129 | add_subdirectory( mobile ) | 129 | add_subdirectory( mobile ) | ||
aacid: Shouldn't this be 5.55? | |||||
130 | endif() | 130 | endif() | ||
131 | option(BUILD_COVERAGE "Build the project with gcov support" OFF) | 131 | option(BUILD_COVERAGE "Build the project with gcov support" OFF) | ||
132 | 132 | | |||
133 | if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | 133 | if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | ||
134 | if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0") | 134 | if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0") | ||
135 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" ) | 135 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" ) | ||
136 | endif() | 136 | endif() | ||
137 | endif() | 137 | endif() | ||
▲ Show 20 Lines • Show All 341 Lines • Show Last 20 Lines |
I don't like this.
If you need a new kirigami or something make a vesion check and then enable kirigami only if X verison is available, but i don't like the general requirement for okular to be increased at this point