From cddb39aceb0dd74d19895743f822c7eab9724e54 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 27 Nov 2013 09:37:31 +0100 Subject: add /FS to cpp.platformC(xx)Flags for VS 2013 Task-number: QBS-411 Change-Id: I83436f66e9de4f22e0a980c6322909e9854b91cf Reviewed-by: Christian Kandeler --- src/app/detect-toolchains/msvcprobe.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/detect-toolchains/msvcprobe.cpp b/src/app/detect-toolchains/msvcprobe.cpp index 0b894ab41..659fe0532 100644 --- a/src/app/detect-toolchains/msvcprobe.cpp +++ b/src/app/detect-toolchains/msvcprobe.cpp @@ -64,8 +64,9 @@ Q_DECLARE_TYPEINFO(WinSDK, Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(MSVC, Q_MOVABLE_TYPE); QT_END_NAMESPACE -static void addMSVCPlatform(Settings *settings, QList &profiles, QString name, - const QString &installPath, const QString &winSDKPath, const QString &architecture) +static void addMSVCPlatform(const MSVC &msvc, Settings *settings, QList &profiles, + QString name, const QString &installPath, const QString &winSDKPath, + const QString &architecture) { name.append(QLatin1Char('_') + architecture); qbsInfo() << Tr::tr("Setting up profile '%1'.").arg(name); @@ -76,6 +77,11 @@ static void addMSVCPlatform(Settings *settings, QList &profiles, QStrin p.setValue("qbs.toolchain", QStringList("msvc")); p.setValue("cpp.windowsSDKPath", winSDKPath); p.setValue("qbs.architecture", canonicalizeArchitecture(architecture)); + if (msvc.version.toInt() >= 2013) { + const QStringList flags(QLatin1String("/FS")); + p.setValue("cpp.platformCFlags", flags); + p.setValue("cpp.platformCxxFlags", flags); + } profiles << p; } @@ -192,14 +198,14 @@ void msvcProbe(Settings *settings, QList &profiles) foreach (const WinSDK &sdk, winSDKs) { foreach (const QString &arch, sdk.architectures) { - addMSVCPlatform(settings, profiles, QLatin1String("WinSDK") + sdk.version, + addMSVCPlatform(sdk, settings, profiles, QLatin1String("WinSDK") + sdk.version, sdk.installPath + QLatin1String("\\bin"), defaultWinSDK.installPath, arch); } } foreach (const MSVC &msvc, msvcs) { foreach (const QString &arch, msvc.architectures) { - addMSVCPlatform(settings, profiles, QLatin1String("MSVC") + msvc.version, + addMSVCPlatform(msvc, settings, profiles, QLatin1String("MSVC") + msvc.version, msvc.installPath, defaultWinSDK.installPath, arch); } } -- cgit v1.2.3