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

CMake: skip auto-setup.cmake for docker kits

Browse Source 
Change-Id: Iaf9e98f8368167b0e665687a118f29d196c20941
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
David Schulz
2021-09-14 13:39:05 +02:00
parent 1831a7a6ad
commit e397394090
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@
#include "configmodelitemdelegate.h" #include "configmodelitemdelegate.h"
#include <android/androidconstants.h> #include <android/androidconstants.h>
#include <docker/dockerconstants.h>
#include <ios/iosconstants.h> #include <ios/iosconstants.h>
#include <qnx/qnxconstants.h> #include <qnx/qnxconstants.h>
#include <webassembly/webassemblyconstants.h> #include <webassembly/webassemblyconstants.h>
@@ -798,6 +799,11 @@ static bool isQnx(const Kit *k)
return DeviceTypeKitAspect::deviceTypeId(k) == Qnx::Constants::QNX_QNX_OS_TYPE; return DeviceTypeKitAspect::deviceTypeId(k) == Qnx::Constants::QNX_QNX_OS_TYPE;
} }
static bool isDocker(const Kit *k)
{
return DeviceTypeKitAspect::deviceTypeId(k) == Docker::Constants::DOCKER_DEVICE_TYPE;
}
static QStringList defaultInitialCMakeArguments(const Kit *k, const QString buildType) static QStringList defaultInitialCMakeArguments(const Kit *k, const QString buildType)
{ {
// Generator: // Generator:
@@ -812,7 +818,7 @@ static QStringList defaultInitialCMakeArguments(const Kit *k, const QString buil
= Internal::CMakeProjectPlugin::projectTypeSpecificSettings(); = Internal::CMakeProjectPlugin::projectTypeSpecificSettings();
// Package manager // Package manager
if (settings->packageManagerAutoSetup.value()) if (!isDocker(k) && settings->packageManagerAutoSetup.value())
initialArgs.append(QString::fromLatin1("-DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%1") initialArgs.append(QString::fromLatin1("-DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%1")
.arg("%{IDE:ResourcePath}/package-manager/auto-setup.cmake")); .arg("%{IDE:ResourcePath}/package-manager/auto-setup.cmake"));