Changeset View
Changeset View
Standalone View
Standalone View
CMakeLists.txt
Show First 20 Lines • Show All 99 Lines • ▼ Show 20 Line(s) | |||||
100 | find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET OPTIONAL_COMPONENTS Crash) | 100 | find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET OPTIONAL_COMPONENTS Crash) | ||
101 | macro_bool_to_01(KF5Crash_FOUND HAVE_KCRASH) | 101 | macro_bool_to_01(KF5Crash_FOUND HAVE_KCRASH) | ||
102 | macro_log_feature(${KF5Crash_FOUND} "KCrash" "KDE's Crash Handler" | 102 | macro_log_feature(${KF5Crash_FOUND} "KCrash" "KDE's Crash Handler" | ||
103 | "https://api.kde.org/frameworks/kcrash/html" FALSE "" | 103 | "https://api.kde.org/frameworks/kcrash/html" FALSE "" | ||
104 | "Optionally used to provide crash reporting on Linux") | 104 | "Optionally used to provide crash reporting on Linux") | ||
105 | 105 | | |||
106 | set(REQUIRED_QT_VERSION 5.4.0) | 106 | set(REQUIRED_QT_VERSION 5.4.0) | ||
107 | find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui Widgets Xml Network PrintSupport Test) | 107 | find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui Widgets Xml Network PrintSupport Test) | ||
108 | find_package(Qt5 ${REQUIRED_QT_VERSION} COMPONENTS UiTools WebKit WebKitWidgets) | 108 | find_package(Qt5 ${REQUIRED_QT_VERSION} COMPONENTS UiTools WebKit WebKitWidgets Qml) | ||
109 | 109 | | |||
staniek: instead how about:
```
if(KEXI_SCRIPTS_SUPPORT)
find_package(Qt5 5.8.0 COMPONENTS Qml)… | |||||
110 | # use sane compile flags | 110 | # use sane compile flags | ||
111 | add_definitions( | 111 | add_definitions( | ||
112 | -DQT_NO_CAST_TO_ASCII | 112 | -DQT_NO_CAST_TO_ASCII | ||
113 | -DQT_NO_SIGNALS_SLOTS_KEYWORDS | 113 | -DQT_NO_SIGNALS_SLOTS_KEYWORDS | ||
114 | -DQT_NO_URL_CAST_FROM_STRING | 114 | -DQT_NO_URL_CAST_FROM_STRING | ||
115 | -DQT_STRICT_ITERATORS | 115 | -DQT_STRICT_ITERATORS | ||
116 | -DQT_USE_FAST_CONCATENATION | 116 | -DQT_USE_FAST_CONCATENATION | ||
117 | -DQT_USE_FAST_OPERATOR_PLUS | 117 | -DQT_USE_FAST_OPERATOR_PLUS | ||
▲ Show 20 Lines • Show All 147 Lines • Show Last 20 Lines |
instead how about:
This way: KEXI_SCRIPTS_SUPPORT is fully controlled by the user, if right version of Qml is missing -> proper error with explanation why Qml is needed