summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/compileroptionsbuilder.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2016-04-11 17:34:02 +0200
committerNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2016-04-12 14:54:06 +0000
commit4e0b55f6739bcf4248cd09c684b8e77ef29b3d85 (patch)
treeac37a08fc4d4832299b634e5606f3d1cd218e0d9 /src/plugins/cpptools/compileroptionsbuilder.cpp
parent973bdac27d1c7ab3bc45bd873bafeb2237248f1b (diff)
downloadqt-creator-4e0b55f6739bcf4248cd09c684b8e77ef29b3d85.tar.gz
Clang: Undefine language features as fix for MSVC2015/clang-3.8.0
This applies the following change for the clang code model, too. commit d13d1795241602ca0cf150b216b282cfb15e406d Clang Static Analyzer: Workaround analyzing MSVC2015 projects with clang 3.8.0 II Change-Id: Ia229d7e8b24c2e1c0a83d9a53c623ea1f79c4a06 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
-rw-r--r--src/plugins/cpptools/compileroptionsbuilder.cpp49
1 files changed, 49 insertions, 0 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index 6de6a44d5d..5b17628682 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -283,6 +283,55 @@ void CompilerOptionsBuilder::addMsvcCompatibilityVersion()
}
}
+static QStringList languageFeatureMacros()
+{
+ // Collected with:
+ // $ CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+ // $ D:\usr\llvm-3.8.0\bin\clang++.exe -fms-compatibility-version=19 -std=c++1y -dM -E D:\empty.cpp | grep __cpp_
+ static QStringList macros {
+ QLatin1String("__cpp_aggregate_nsdmi"),
+ QLatin1String("__cpp_alias_templates"),
+ QLatin1String("__cpp_attributes"),
+ QLatin1String("__cpp_binary_literals"),
+ QLatin1String("__cpp_constexpr"),
+ QLatin1String("__cpp_decltype"),
+ QLatin1String("__cpp_decltype_auto"),
+ QLatin1String("__cpp_delegating_constructors"),
+ QLatin1String("__cpp_digit_separators"),
+ QLatin1String("__cpp_generic_lambdas"),
+ QLatin1String("__cpp_inheriting_constructors"),
+ QLatin1String("__cpp_init_captures"),
+ QLatin1String("__cpp_initializer_lists"),
+ QLatin1String("__cpp_lambdas"),
+ QLatin1String("__cpp_nsdmi"),
+ QLatin1String("__cpp_range_based_for"),
+ QLatin1String("__cpp_raw_strings"),
+ QLatin1String("__cpp_ref_qualifiers"),
+ QLatin1String("__cpp_return_type_deduction"),
+ QLatin1String("__cpp_rtti"),
+ QLatin1String("__cpp_rvalue_references"),
+ QLatin1String("__cpp_static_assert"),
+ QLatin1String("__cpp_unicode_characters"),
+ QLatin1String("__cpp_unicode_literals"),
+ QLatin1String("__cpp_user_defined_literals"),
+ QLatin1String("__cpp_variable_templates"),
+ QLatin1String("__cpp_variadic_templates"),
+ };
+
+ return macros;
+}
+
+void CompilerOptionsBuilder::undefineCppLanguageFeatureMacrosForMsvc2015()
+{
+ if (m_projectPart.toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID
+ && m_projectPart.isMsvc2015Toolchain) {
+ // Undefine the language feature macros that are pre-defined in clang-cl 3.8.0,
+ // but not in MSVC2015's cl.exe.
+ foreach (const QString &macroName, languageFeatureMacros())
+ m_options.append(QLatin1String("/U") + macroName);
+ }
+}
+
QString CompilerOptionsBuilder::includeOption() const
{
return QLatin1String("-I");