diff options
| author | Florian Boucault <florian.boucault@canonical.com> | 2016-11-16 10:41:28 +0000 |
|---|---|---|
| committer | Bileto Bot <ci-train-bot@canonical.com> | 2016-11-16 10:41:28 +0000 |
| commit | 9d914ffc47a1064fc546d01dda2bfe8cf9479c48 (patch) | |
| tree | c2fb272680b741a0caeb0dd1ecc0c16db729d2c4 | |
| parent | 24f649fed3630e9fbb3c24140dde1b4f9018f4aa (diff) | |
| parent | c6bba62bdac1f3cdb20e9bd7a763a2ec03beeb44 (diff) | |
| download | qmenumodel-9d914ffc47a1064fc546d01dda2bfe8cf9479c48.tar.gz qmenumodel-9d914ffc47a1064fc546d01dda2bfe8cf9479c48.tar.bz2 qmenumodel-9d914ffc47a1064fc546d01dda2bfe8cf9479c48.zip | |
Crossbuilding fixes.
Approved by: Marco Trevisan (Treviño)
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | libqmenumodel/QMenuModel/CMakeLists.txt | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/debian/control b/debian/control index f8021ce..2008f64 100644 --- a/debian/control +++ b/debian/control @@ -9,9 +9,9 @@ Build-Depends: debhelper (>= 9.0.0), qt5-qmake, qtbase5-dev (>= 5.0), qtdeclarative5-dev (>= 5.0), - python3, - python3-dbus, - python3-gi, + python3:any, + python3-dbus:native, + python3-gi:native, gir1.2-glib-2.0, dbus-test-runner, libgles2-mesa-dev | libgl-dev, diff --git a/libqmenumodel/QMenuModel/CMakeLists.txt b/libqmenumodel/QMenuModel/CMakeLists.txt index 78e062b..eb4d463 100644 --- a/libqmenumodel/QMenuModel/CMakeLists.txt +++ b/libqmenumodel/QMenuModel/CMakeLists.txt @@ -24,11 +24,7 @@ qt5_use_modules(qmenumodel-qml Qml Quick) execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" "${CMAKE_CURRENT_BINARY_DIR}/qmldir") -execute_process( - COMMAND qmake -query QT_INSTALL_QML - OUTPUT_VARIABLE QT_IMPORTS_DIR - OUTPUT_STRIP_TRAILING_WHITESPACE -) +set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml") set(QMLPLUGIN_INSTALL_PREFIX "${QT_IMPORTS_DIR}/QMenuModel") install(TARGETS qmenumodel-qml DESTINATION ${QMLPLUGIN_INSTALL_PREFIX}) install(FILES qmldir DESTINATION ${QMLPLUGIN_INSTALL_PREFIX}) |