feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: fix passing ANDROID_SDK_ROOT for CMake

Browse Source 
Task-number: QTBUG-87991
Change-Id: I70ed0709caf339324af8c233f311a2db2945006e
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-11-05 14:21:12 +02:00
parent 06b653879f
commit d604d5da18
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -171,19 +171,15 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Utils::Id id)
QString::fromLatin1("-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}")); QString::fromLatin1("-DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}"));
QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(k); QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(k);
QString androidSdkKey = "-DANDROID_SDK"; auto sdkLocation = bs->data(Android::Constants::SdkLocation).value<FilePath>();
if (qt->qtVersion() >= QtSupport::QtVersionNumber{6, 0, 0}) { if (qt->qtVersion() >= QtSupport::QtVersionNumber{6, 0, 0}) {
initialArgs.append( initialArgs.append(
QString::fromLatin1("-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}")); QString::fromLatin1("-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}"));
androidSdkKey.append("_ROOT"); initialArgs.append(QString("-DANDROID_SDK_ROOT:PATH=%1").arg(sdkLocation.toString()));
} } else {
initialArgs.append(QString("-DANDROID_SDK:PATH=%1").arg(sdkLocation.toString()));
if (qt && qt->supportsMultipleQtAbis()) {
auto sdkLocation = bs->data(Android::Constants::SdkLocation).value<FilePath>();
initialArgs.append(
QString("%1:PATH=%2").arg(androidSdkKey).arg(sdkLocation.toString()));
} }
} }