diff options
author | MÃ¥rten Nordheim <marten.nordheim@qt.io> | 2021-09-10 14:10:55 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-11 05:02:15 +0000 |
commit | 54fc6ef3c60d868b84dc95e688fa7cd9e55e0663 (patch) | |
tree | 7dbf7b209a8afc9f0906d41c6dde57335c76d103 | |
parent | 861593368e72714b1272e74a34cd02316b6a4061 (diff) |
qdevice.pri: Use cmake separators for the path
Because otherwise we may end up with trailing backslashes
Change-Id: I7ad24ec34c35f0a7b32241751bbcd2b26a8a23ea
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit a2653331330340c4f44457c49005f4c7226b8316)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | cmake/QtPriHelpers.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index fa31ea9a5c..ed6513133f 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -680,7 +680,9 @@ function(qt_generate_global_device_pri_file) # Write android specific device info. if(ANDROID) + file(TO_CMAKE_PATH ${ANDROID_SDK_ROOT} ANDROID_SDK_ROOT) string(APPEND content "DEFAULT_ANDROID_SDK_ROOT = ${ANDROID_SDK_ROOT}\n") + file(TO_CMAKE_PATH ${ANDROID_NDK} ANDROID_NDK) string(APPEND content "DEFAULT_ANDROID_NDK_ROOT = ${ANDROID_NDK}\n") set(android_platform "android-23") |