Changeset View
Changeset View
Standalone View
Standalone View
CMakeLists.txt
Show First 20 Lines • Show All 109 Lines • ▼ Show 20 Line(s) | |||||
110 | find_package(KF5 ${REQUIRED_KF5_VERSION} COMPONENTS Crash) | 110 | find_package(KF5 ${REQUIRED_KF5_VERSION} COMPONENTS Crash) | ||
111 | macro_bool_to_01(KF5Crash_FOUND HAVE_KCRASH) | 111 | macro_bool_to_01(KF5Crash_FOUND HAVE_KCRASH) | ||
112 | set_package_properties(KF5Crash PROPERTIES TYPE OPTIONAL | 112 | set_package_properties(KF5Crash PROPERTIES TYPE OPTIONAL | ||
113 | PURPOSE "Used to provide crash reporting on Linux") | 113 | PURPOSE "Used to provide crash reporting on Linux") | ||
114 | 114 | | |||
115 | set(REQUIRED_QT_VERSION 5.4.0) | 115 | set(REQUIRED_QT_VERSION 5.4.0) | ||
116 | find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui Widgets Xml Network PrintSupport Test) | 116 | find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui Widgets Xml Network PrintSupport Test) | ||
117 | find_package(Qt5 ${REQUIRED_QT_VERSION} COMPONENTS UiTools WebKit WebKitWidgets) | 117 | find_package(Qt5 ${REQUIRED_QT_VERSION} COMPONENTS UiTools WebKit WebKitWidgets) | ||
118 | 118 | | |||
staniek: instead how about:
```
if(KEXI_SCRIPTS_SUPPORT)
find_package(Qt5 5.8.0 COMPONENTS Qml)… | |||||
119 | if(KEXI_SCRIPTS_SUPPORT) | ||||
120 | find_package(Qt5 5.8.0 COMPONENTS Qml) | ||||
121 | set_package_properties(Qt5Qml PROPERTIES | ||||
122 | DESCRIPTION "A framework for developing applications and libraries with the QML and JavaScript language." | ||||
123 | URL "http://qt.io" | ||||
124 | TYPE REQUIRED PURPOSE "Required by Kexi scripting (JavaScript)" | ||||
125 | ) | ||||
126 | endif() | ||||
127 | | ||||
119 | # use sane compile flags | 128 | # use sane compile flags | ||
120 | add_definitions( | 129 | add_definitions( | ||
121 | -DQT_NO_CAST_TO_ASCII | 130 | -DQT_NO_CAST_TO_ASCII | ||
122 | -DQT_NO_SIGNALS_SLOTS_KEYWORDS | 131 | -DQT_NO_SIGNALS_SLOTS_KEYWORDS | ||
123 | -DQT_NO_URL_CAST_FROM_STRING | 132 | -DQT_NO_URL_CAST_FROM_STRING | ||
124 | -DQT_STRICT_ITERATORS | 133 | -DQT_STRICT_ITERATORS | ||
125 | -DQT_USE_FAST_CONCATENATION | 134 | -DQT_USE_FAST_CONCATENATION | ||
126 | -DQT_USE_FAST_OPERATOR_PLUS | 135 | -DQT_USE_FAST_OPERATOR_PLUS | ||
▲ Show 20 Lines • Show All 164 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