aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Boucault <florian.boucault@canonical.com>2016-07-19 22:41:52 +0200
committerFlorian Boucault <florian.boucault@canonical.com>2016-07-19 22:41:52 +0200
commitc6bba62bdac1f3cdb20e9bd7a763a2ec03beeb44 (patch)
tree171f504f20d8f1d62cbb844f31c5e0a240c9e59b
parent9efd410b91168d2afe730d3fc53bc8718ca39347 (diff)
downloadqmenumodel-c6bba62bdac1f3cdb20e9bd7a763a2ec03beeb44.tar.gz
qmenumodel-c6bba62bdac1f3cdb20e9bd7a763a2ec03beeb44.tar.bz2
qmenumodel-c6bba62bdac1f3cdb20e9bd7a763a2ec03beeb44.zip
Crossbuilding fixes.
-rw-r--r--debian/control6
-rw-r--r--libqmenumodel/QMenuModel/CMakeLists.txt6
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})