diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2021-09-10 14:10:55 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2021-09-10 21:12:58 +0200 |
| commit | a2653331330340c4f44457c49005f4c7226b8316 (patch) | |
| tree | bafebc0b7279489f3b4131eaa069dc04b6019117 /cmake | |
| parent | 9ba4ce0102c7561c0a126ed21a8bce4d2700f332 (diff) | |
qdevice.pri: Use cmake separators for the path
Because otherwise we may end up with trailing backslashes
Pick-to: 6.2 6.2.0 6.1
Change-Id: I7ad24ec34c35f0a7b32241751bbcd2b26a8a23ea
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake')
| -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 a7da0c2538..75e21c5ce2 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -681,7 +681,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") |