Merge lp:~fboucault/libusermetrics/crossbuild_fixes into lp:libusermetrics

Proposed by Florian Boucault on 2016-07-05
Status: Approved
Approved by: Pete Woods on 2016-07-14
Approved revision: 227
Proposed branch: lp:~fboucault/libusermetrics/crossbuild_fixes
Merge into: lp:libusermetrics
Diff against target: 23 lines (+1/-12)
1 file modified
src/modules/UserMetrics/CMakeLists.txt (+1/-12)
To merge this branch: bzr merge lp:~fboucault/libusermetrics/crossbuild_fixes
Reviewer Review Type Date Requested Status
Pete Woods (community) 2016-07-05 Approve on 2016-07-14
PS Jenkins bot continuous-integration Pending
Review via email: mp+299209@code.launchpad.net

Commit message

Fixes for crossbuilding.

Description of the change

Fixes for crossbuilding.

To post a comment you must log in.
Pete Woods (pete-woods) :
review: Approve

Unmerged revisions

227. By Florian Boucault on 2016-07-05

Fixes for crossbuilding.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/modules/UserMetrics/CMakeLists.txt'
2--- src/modules/UserMetrics/CMakeLists.txt 2013-10-02 09:34:27 +0000
3+++ src/modules/UserMetrics/CMakeLists.txt 2016-07-05 18:13:09 +0000
4@@ -21,18 +21,7 @@
5 ${Qt5Quick_LIBRARIES}
6 )
7
8-# Qt5's cmake does not export QT_IMPORTS_DIR, lets query qmake on our own for now
9-get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
10-function(QUERY_QMAKE VAR RESULT)
11- exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output )
12- if(NOT return_code)
13- file(TO_CMAKE_PATH "${output}" output)
14- set(${RESULT} ${output} PARENT_SCOPE)
15- endif(NOT return_code)
16-endfunction(QUERY_QMAKE)
17-query_qmake(QT_INSTALL_QML QT_IMPORTS_DIR)
18-
19-
20+set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml")
21 set(PLUGIN_DIR ${QT_IMPORTS_DIR}/UserMetrics)
22 install(TARGETS usermetrics-qml DESTINATION ${PLUGIN_DIR})
23 install(FILES qmldir DESTINATION ${PLUGIN_DIR})

Subscribers

People subscribed via source and target branches

to all changes: