diff options
| author | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2014-02-03 12:37:26 +0100 |
|---|---|---|
| committer | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2014-02-03 12:37:26 +0100 |
| commit | b9b156bfc4e866b9f5055dc8ed86a7f322e0ce2a (patch) | |
| tree | bb187241839c47b6fc044db7937d1afd89c8d176 | |
| parent | 8f46cc8fe5b675cf42d4d9aa20a0d731b5334a57 (diff) | |
cmake: add the missing QTGSTREAMER_QTQUICK2_INSTALL_DIR variable
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/modules/FindQt4or5.cmake | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e64104..9304fc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,9 +163,11 @@ endif() if (USE_QT_PLUGIN_DIR) set(QTGSTREAMER_QTQUICK1_INSTALL_DIR ${QT_IMPORTS_DIR}) + set(QTGSTREAMER_QTQUICK2_INSTALL_DIR ${QT_QML_DIR}) else() if (USE_QT5) set(QTGSTREAMER_QTQUICK1_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt5/imports) + set(QTGSTREAMER_QTQUICK2_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt5/qml) else() set(QTGSTREAMER_QTQUICK1_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt4/imports) endif() diff --git a/cmake/modules/FindQt4or5.cmake b/cmake/modules/FindQt4or5.cmake index b0f6874..855a48e 100644 --- a/cmake/modules/FindQt4or5.cmake +++ b/cmake/modules/FindQt4or5.cmake @@ -76,7 +76,7 @@ if (${QT_VERSION} STREQUAL "5") set(_Qt4or5_FOUND ${Qt5Core_FOUND}) - # Set QT_QMAKE_EXECUTABLE and QT_IMPORTS_DIR + # Set QT_QMAKE_EXECUTABLE, QT_IMPORTS_DIR and QT_QML_DIR if (Qt5Core_FOUND) get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} IMPORTED_LOCATION) @@ -92,6 +92,7 @@ if (${QT_VERSION} STREQUAL "5") endfunction() _qt5_query_qmake(QT_INSTALL_IMPORTS QT_IMPORTS_DIR) + _qt5_query_qmake(QT_INSTALL_QML QT_QML_DIR) endif() # Set pkg-config package names |