diff options
Diffstat (limited to 'libqmenumodel')
| -rw-r--r-- | libqmenumodel/QMenuModel/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | libqmenumodel/src/qmenumodel.pc.in | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libqmenumodel/QMenuModel/CMakeLists.txt b/libqmenumodel/QMenuModel/CMakeLists.txt index 8a7702f..7367e18 100644 --- a/libqmenumodel/QMenuModel/CMakeLists.txt +++ b/libqmenumodel/QMenuModel/CMakeLists.txt @@ -24,9 +24,11 @@ qt5_use_modules(qmenumodel-qml Qml Widgets) execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" "${CMAKE_CURRENT_BINARY_DIR}/qmldir") -# Apparently, QT_IMPORTS_DIR didn’t make it to Qt5. -# In want of a better solution, let’s hardcode it… -set(QT_IMPORTS_DIR /opt/qt5/imports) +execute_process( + COMMAND qmake -query QT_INSTALL_QML + OUTPUT_VARIABLE QT_IMPORTS_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE +) set(QMLPLUGIN_INSTALL_PREFIX "${QT_IMPORTS_DIR}/QMenuModel") install(TARGETS qmenumodel-qml DESTINATION ${QMLPLUGIN_INSTALL_PREFIX}) install(FILES qmldir DESTINATION ${QMLPLUGIN_INSTALL_PREFIX}) diff --git a/libqmenumodel/src/qmenumodel.pc.in b/libqmenumodel/src/qmenumodel.pc.in index 1c410bc..56f149a 100644 --- a/libqmenumodel/src/qmenumodel.pc.in +++ b/libqmenumodel/src/qmenumodel.pc.in @@ -7,7 +7,7 @@ Name: qmenumodel Description: Qt binding for GMenuModel. Version: 0.1 -Requires.private: QtCore QtWidgets gio-2.0 +Requires.private: Qt5Core Qt5Widgets gio-2.0 Libs: -L${libdir} -l@SHAREDLIBNAME@ Cflags: -I${includedir}/@INCLUDEDIR@ |