diff options
| author | Volker Krause <vkrause@kde.org> | 2018-03-09 16:25:04 +0100 |
|---|---|---|
| committer | Volker Krause <vkrause@kde.org> | 2018-03-10 10:23:25 +0100 |
| commit | 919b6be0004de4cd99fad31cfb9774ac5a7952e9 (patch) | |
| tree | 0b01f421a11b72cb4bf8138a59362952ad6de8a7 /toolchain | |
| parent | d28a0d538a1833557f8557eb4f00c6e3414c59b9 (diff) | |
| download | extra-cmake-modules-919b6be0004de4cd99fad31cfb9774ac5a7952e9.tar.gz extra-cmake-modules-919b6be0004de4cd99fad31cfb9774ac5a7952e9.tar.bz2 | |
Resolve symlinks in QML import paths
Summary: qmlimportscanner fails when provided symlinks, so work around that.
Reviewers: #build_system, apol
Reviewed By: apol
Subscribers: #frameworks
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D11181
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/Android.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index a8e3c96e..f0d6ea71 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -241,11 +241,13 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET ${CREATEAPK_TARGET_NAME}) set(EXECUTABLE_DESTINATION_PATH "${EXPORT_DIR}/libs/${ANDROID_ABI}/lib${QTANDROID_EXPORTED_TARGET}.so") set(QML_IMPORT_PATHS "") foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH}) - if(EXISTS "${prefix}/lib/qml") + # qmlimportscanner chokes on symlinks, so we need to resolve those first + get_filename_component(qml_path "${prefix}/lib/qml" REALPATH) + if(EXISTS ${qml_path}) if (QML_IMPORT_PATHS) - set(QML_IMPORT_PATHS "${QML_IMPORT_PATHS},${prefix}/lib/qml") + set(QML_IMPORT_PATHS "${QML_IMPORT_PATHS},${qml_path}") else() - set(QML_IMPORT_PATHS "${prefix}/lib/qml") + set(QML_IMPORT_PATHS "${qml_path}") endif() endif() endforeach() |