diff options
author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2013-01-31 19:18:48 +0000 |
---|---|---|
committer | Tarmac <> | 2013-01-31 19:18:48 +0000 |
commit | 095aed4a09a31f017626f75805addce63d4bf8d6 (patch) | |
tree | f6ff769f61bd0764e9417e4228fc539aeeccd0c5 /libqmenumodel/QMenuModel/CMakeLists.txt | |
parent | 954e6e636d5d8f903f7b6874d0e21a30c274d530 (diff) | |
parent | 08e25df5e99773e05ab055d11655dff23a3d831d (diff) | |
download | qmenumodel-095aed4a09a31f017626f75805addce63d4bf8d6.tar.gz qmenumodel-095aed4a09a31f017626f75805addce63d4bf8d6.tar.bz2 qmenumodel-095aed4a09a31f017626f75805addce63d4bf8d6.zip |
Updated to qt5 final.
Approved by PS Jenkins bot, Gustavo Pichorim Boiko.
Diffstat (limited to 'libqmenumodel/QMenuModel/CMakeLists.txt')
-rw-r--r-- | libqmenumodel/QMenuModel/CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 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}) |