diff options
author | Marco Bubke <marco.bubke@qt.io> | 2016-12-14 14:56:17 +0100 |
---|---|---|
committer | Marco Bubke <marco.bubke@qt.io> | 2016-12-15 10:18:15 +0000 |
commit | 1e3f2eec8dc59c1fc113716b380f492a5c207459 (patch) | |
tree | 18307fc6bf41e4b8de262ff46fdcab1ef67c12c8 /src/plugins/clangrefactoring/refactoringcompileroptionsbuilder.cpp | |
parent | 11e0eaacc3aab32d6ba1eaac40189814da79f5b5 (diff) | |
download | qt-creator-1e3f2eec8dc59c1fc113716b380f492a5c207459.tar.gz |
Clang: Consolidate all ClangCompilerOptionsBuilder into one implementation
We used the same code in different but don't shared it. From a bug fixing
perspective it's actually not that smart.
Change-Id: Iaaffc883229e259ff77f95b5cf0a8f0d8b5117df
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/clangrefactoring/refactoringcompileroptionsbuilder.cpp')
-rw-r--r-- | src/plugins/clangrefactoring/refactoringcompileroptionsbuilder.cpp | 152 |
1 files changed, 0 insertions, 152 deletions
diff --git a/src/plugins/clangrefactoring/refactoringcompileroptionsbuilder.cpp b/src/plugins/clangrefactoring/refactoringcompileroptionsbuilder.cpp deleted file mode 100644 index 4500d01115..0000000000 --- a/src/plugins/clangrefactoring/refactoringcompileroptionsbuilder.cpp +++ /dev/null @@ -1,152 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "refactoringcompileroptionsbuilder.h" - -namespace ClangRefactoring { - -namespace { - -QString getCreatorResourcePath() -{ -#ifndef UNIT_TESTS - return Core::ICore::instance()->resourcePath(); -#else - return QString(); -#endif -} - -QString getClangIncludeDirectory() -{ - QDir dir(getCreatorResourcePath() + QLatin1String("/cplusplus/clang/") + - QLatin1String(CLANG_VERSION) + QLatin1String("/include")); - if (!dir.exists() || !QFileInfo(dir, QLatin1String("stdint.h")).exists()) - dir = QDir(QLatin1String(CLANG_RESOURCE_DIR)); - return dir.canonicalPath(); -} - -} - -RefactoringCompilerOptionsBuilder::RefactoringCompilerOptionsBuilder(CppTools::ProjectPart *projectPart) - : CompilerOptionsBuilder(*projectPart) -{ -} - -bool RefactoringCompilerOptionsBuilder::excludeHeaderPath(const QString &path) const -{ - if (m_projectPart.toolchainType == ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID) { - if (path.contains(QLatin1String("lib/gcc/i686-apple-darwin"))) - return true; - } - - return CompilerOptionsBuilder::excludeHeaderPath(path); -} - -void RefactoringCompilerOptionsBuilder::addPredefinedMacrosAndHeaderPathsOptions() -{ - if (m_projectPart.toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID) - addPredefinedMacrosAndHeaderPathsOptionsForMsvc(); - else - addPredefinedMacrosAndHeaderPathsOptionsForNonMsvc(); -} - -void RefactoringCompilerOptionsBuilder::addPredefinedMacrosAndHeaderPathsOptionsForMsvc() -{ - add(QLatin1String("-nostdinc")); - add(QLatin1String("-undef")); -} - -void RefactoringCompilerOptionsBuilder::addPredefinedMacrosAndHeaderPathsOptionsForNonMsvc() -{ - static const QString resourceDir = getClangIncludeDirectory(); - if (!resourceDir.isEmpty()) { - add(QLatin1String("-nostdlibinc")); - add(QLatin1String("-I") + resourceDir); - add(QLatin1String("-undef")); - } -} - -void RefactoringCompilerOptionsBuilder::addWrappedQtHeadersIncludePath() -{ - static const QString wrappedQtHeaders = getCreatorResourcePath() - + QStringLiteral("/cplusplus/wrappedQtHeaders"); - - if (m_projectPart.qtVersion != CppTools::ProjectPart::NoQt) { - add(QLatin1String("-I") + wrappedQtHeaders); - add(QLatin1String("-I") + wrappedQtHeaders + QLatin1String("/QtCore")); - } -} - -void RefactoringCompilerOptionsBuilder::addProjectConfigFileInclude() -{ - if (!m_projectPart.projectConfigFile.isEmpty()) { - add(QLatin1String("-include")); - add(m_projectPart.projectConfigFile); - } -} - -void RefactoringCompilerOptionsBuilder::addExtraOptions() -{ - add(QLatin1String("-fmessage-length=0")); - add(QLatin1String("-fdiagnostics-show-note-include-stack")); - add(QLatin1String("-fmacro-backtrace-limit=0")); - add(QLatin1String("-fretain-comments-from-system-headers")); - add(QLatin1String("-ferror-limit=1000")); -} - -Utils::SmallStringVector RefactoringCompilerOptionsBuilder::build(CppTools::ProjectPart *projectPart, - CppTools::ProjectFile::Kind fileKind, - PchUsage pchUsage) -{ - if (projectPart == nullptr) - return Utils::SmallStringVector(); - - RefactoringCompilerOptionsBuilder optionsBuilder(projectPart); - - optionsBuilder.addWordWidth(); - optionsBuilder.addTargetTriple(); - optionsBuilder.addLanguageOption(fileKind); - optionsBuilder.addOptionsForLanguage(/*checkForBorlandExtensions*/ true); - optionsBuilder.enableExceptions(); - - optionsBuilder.addDefineFloat128ForMingw(); - optionsBuilder.addDefineToAvoidIncludingGccOrMinGwIntrinsics(); - optionsBuilder.addToolchainAndProjectDefines(); - optionsBuilder.undefineCppLanguageFeatureMacrosForMsvc2015(); - - optionsBuilder.addPredefinedMacrosAndHeaderPathsOptions(); - optionsBuilder.addWrappedQtHeadersIncludePath(); - optionsBuilder.addHeaderPathOptions(); - optionsBuilder.addPrecompiledHeaderOptions(pchUsage); - optionsBuilder.addProjectConfigFileInclude(); - - optionsBuilder.addMsvcCompatibilityVersion(); - - optionsBuilder.addExtraOptions(); - - return Utils::SmallStringVector(optionsBuilder.options()); -} - -} // namespace ClangRefactoring |