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

[Florian Boucault]

Fixes for crossbuilding.

Fixes for crossbuilding.

[Pete Woods (pete-woods)]

review: Approve

Unmerged revisions

227. By Florian Boucault on 2016-07-05

Fixes for crossbuilding.

=== modified file 'src/modules/UserMetrics/CMakeLists.txt'
--- src/modules/UserMetrics/CMakeLists.txt	2013-10-02 09:34:27 +0000
+++ src/modules/UserMetrics/CMakeLists.txt	2016-07-05 18:13:09 +0000
@@ -21,18 +21,7 @@
     ${Qt5Quick_LIBRARIES}
 )
 
-# Qt5's cmake does not export QT_IMPORTS_DIR, lets query qmake on our own for now
-get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION) 
-function(QUERY_QMAKE VAR RESULT) 
-  exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output ) 
-  if(NOT return_code) 
-    file(TO_CMAKE_PATH "${output}" output) 
-    set(${RESULT} ${output} PARENT_SCOPE) 
-  endif(NOT return_code) 
-endfunction(QUERY_QMAKE) 
-query_qmake(QT_INSTALL_QML QT_IMPORTS_DIR)
-
-
+set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml")
 set(PLUGIN_DIR ${QT_IMPORTS_DIR}/UserMetrics)
 install(TARGETS usermetrics-qml DESTINATION ${PLUGIN_DIR})
 install(FILES qmldir DESTINATION ${PLUGIN_DIR})