[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble/qt5] src: fix qml components install dir for Qt5
From:       Michael Zanetti <michael_zanetti () gmx ! net>
Date:       2013-09-22 19:41:59
Message-ID: E1VNpXb-0003Jn-Il () scm ! kde ! org
[Download RAW message or body]

Git commit fce79d7500e3fdb593e8b2c9533727360f274ab6 by Michael Zanetti.
Committed on 22/09/2013 at 19:40.
Pushed by mzanetti into branch 'qt5'.

fix qml components install dir for Qt5

M  +5    -1    src/CMakeLists.txt

http://commits.kde.org/marble/fce79d7500e3fdb593e8b2c9533727360f274ab6

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fe0f12b..3a4355b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,11 @@ if( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
     SET(MARBLE_QT_IMPORTS_DIR ${QT_IMPORTS_DIR})
   ELSE()
     # Fallback when FindQt4.cmake (part of cmake) does not define QT_IMPORTS_DIR. \
                Get it from qmake instead.
-    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_IMPORTS" \
OUTPUT_VARIABLE MARBLE_QT_IMPORTS_DIR ) +    IF( QT4_FOUND )
+      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_IMPORTS" \
OUTPUT_VARIABLE MARBLE_QT_IMPORTS_DIR ) +    ELSE()
+      EXEC_PROGRAM( qmake ARGS "-qt=qt5 -query QT_INSTALL_QML" OUTPUT_VARIABLE \
MARBLE_QT_IMPORTS_DIR ) +    ENDIF()
   ENDIF()
   STRING(LENGTH ${CMAKE_INSTALL_PREFIX} _MARBLE_CMAKE_INSTALL_PREFIX_LEN)
   STRING(LENGTH ${MARBLE_QT_IMPORTS_DIR} _MARBLE_QT_IMPORTS_DIR_LEN)


[prev in list] [next in list] [prev in thread] [next in thread]