feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
f90bc7fa378265fc814d294f7ef12ee28de91cc0
qt-creator/tests/unit/unittest/compileroptionsbuilder-test.cpp

740 lines
34 KiB
C++
Raw Normal View History

CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
/****************************************************************************
**
** Copyright (C) 2018 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 "googletest.h"
#include <cpptools/compileroptionsbuilder.h>
#include <cpptools/cppprojectfile.h>
#include <cpptools/projectpart.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h>
using CppTools::CompilerOptionsBuilder;
using CppTools::ProjectFile;
using CppTools::ProjectPart;
using ProjectExplorer::HeaderPath;
using ProjectExplorer::HeaderPathType;
using ProjectExplorer::Project;
MATCHER_P(IsPartOfHeader, headerPart, std::string(negation ? "isn't " : "is ") + headerPart)
{
Unittest: Fix compileroptionsbuilder-test paths on Linux Match paths partially not to construct the whole path. Change-Id: I397ac930e2d74b8eba98d1b523aabd4ed92f2aee Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-10-09 11:02:22 +02:00
return arg.contains(QString::fromStdString(headerPart));
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
namespace {
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
class CompilerOptionsBuilder : public ::testing::Test
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
protected:
void SetUp() final
{
projectPart.project = project.get();
projectPart.toolchainType = ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID;
Utils: Move C++ language details from ProjectExplorer to Utils We want to use them in the backend processes too so it's nice to share them in Utils. A concrete size was added too because they should be serialized. Change-Id: Id5eb8f46643d5159f034fc9559f68a08d7e5847a Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-09 18:31:20 +01:00
projectPart.languageVersion = Utils::LanguageVersion::CXX17;
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
projectPart.toolChainWordWidth = CppTools::ProjectPart::WordWidth64Bit;
projectPart.toolChainTargetTriple = "x86_64-apple-darwin10";
projectPart.precompiledHeaders = QStringList{TESTDATA_DIR "/compileroptionsbuilder.pch"};
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
projectPart.toolChainMacros = {ProjectExplorer::Macro{"foo", "bar"},
ProjectExplorer::Macro{"__cplusplus", "2"},
ProjectExplorer::Macro{"__STDC_VERSION__", "2"},
ProjectExplorer::Macro{"_MSVC_LANG", "2"},
ProjectExplorer::Macro{"_MSC_BUILD", "2"},
ProjectExplorer::Macro{"_MSC_FULL_VER", "1900"},
ProjectExplorer::Macro{"_MSC_VER", "19"}};
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
projectPart.projectMacros = {ProjectExplorer::Macro{"projectFoo", "projectBar"}};
CppTools: Move QtVersion and BuildTargetType QtVersion to utils/cpplanguage_details.h which already contains similar flags. BuildTargetType to ProjectExplorer, next to BuildTargetInfo (but not in the same header to not pull that in everywhere). Removes dependency on ProjectPart from RawProjectPart. Change-Id: I5791065e4266f20c2657ee4b1b594df04b238a1c Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-08-28 13:04:16 +02:00
projectPart.qtVersion = Utils::QtVersion::Qt5;
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
projectPart.headerPaths = {HeaderPath{"/tmp/builtin_path", HeaderPathType::BuiltIn},
HeaderPath{"/tmp/system_path", HeaderPathType::System},
HeaderPath{"/tmp/path", HeaderPathType::User}};
}
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
static HeaderPath builtIn(const QString &path)
{
return HeaderPath{path, HeaderPathType::BuiltIn};
}
QString toNative(const QString &toNative)
{
return QDir::toNativeSeparators(toNative);
}
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
std::unique_ptr<Project> project{std::make_unique<ProjectExplorer::Project>()};
ProjectPart projectPart;
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart};
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
};
Clang: Never use toolchain defines The known cases provide enough flags not to require toolchain defines. Change-Id: Ia7e08a90eca6ea9474db40683ac1e63236f8643d Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:50:39 +01:00
TEST_F(CompilerOptionsBuilder, AddProjectMacros)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
Clang: Never use toolchain defines The known cases provide enough flags not to require toolchain defines. Change-Id: Ia7e08a90eca6ea9474db40683ac1e63236f8643d Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:50:39 +01:00
compilerOptionsBuilder.addProjectMacros();
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
Clang: Never use toolchain defines The known cases provide enough flags not to require toolchain defines. Change-Id: Ia7e08a90eca6ea9474db40683ac1e63236f8643d Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:50:39 +01:00
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-DprojectFoo=projectBar"));
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
}
Clang: Forward compiler options for gcc/clang Rely on clang to do the "right thing" with them. Change-Id: I44adf2cd5c61549896da3fc9b7c35c2fb0142060 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-08 16:22:39 +01:00
TEST_F(CompilerOptionsBuilder, CompilerFlagsFiltering_UnknownOptionsAreForwarded)
{
ProjectPart part = projectPart;
part.compilerFlags = QStringList{"-fancyFlag"};
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{part,
CppTools::UseSystemHeader::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
CppTools::UseTweakedHeaderPaths::No,
Clang: Forward compiler options for gcc/clang Rely on clang to do the "right thing" with them. Change-Id: I44adf2cd5c61549896da3fc9b7c35c2fb0142060 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-08 16:22:39 +01:00
CppTools::UseLanguageDefines::Yes};
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
ASSERT_THAT(compilerOptionsBuilder.options(), Contains(part.compilerFlags.first()));
}
Clang: Allow to forward warnings flags from build system Change-Id: I47ebb1ce4f3b5544408eb1d0f891ed5090394282 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-31 10:16:28 +01:00
TEST_F(CompilerOptionsBuilder, CompilerFlagsFiltering_WarningsFlagsAreNotFilteredIfRequested)
{
ProjectPart part = projectPart;
part.compilerFlags = QStringList{"-Whello"};
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{part,
CppTools::UseSystemHeader::No,
CppTools::UseTweakedHeaderPaths::No,
CppTools::UseLanguageDefines::No,
CppTools::UseBuildSystemWarnings::Yes};
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
ASSERT_THAT(compilerOptionsBuilder.options(), Contains(part.compilerFlags.first()));
}
Clang: Forward compiler options for gcc/clang Rely on clang to do the "right thing" with them. Change-Id: I44adf2cd5c61549896da3fc9b7c35c2fb0142060 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-08 16:22:39 +01:00
TEST_F(CompilerOptionsBuilder, CompilerFlagsFiltering_DiagnosticOptionsAreRemoved)
{
ProjectPart part = projectPart;
part.compilerFlags = QStringList{"-Wbla", "-pedantic"};
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{part,
CppTools::UseSystemHeader::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
CppTools::UseTweakedHeaderPaths::No,
Clang: Forward compiler options for gcc/clang Rely on clang to do the "right thing" with them. Change-Id: I44adf2cd5c61549896da3fc9b7c35c2fb0142060 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-08 16:22:39 +01:00
CppTools::UseLanguageDefines::Yes};
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
ASSERT_THAT(compilerOptionsBuilder.options(), Not(Contains(part.compilerFlags[0])));
ASSERT_THAT(compilerOptionsBuilder.options(), Not(Contains(part.compilerFlags[1])));
}
TEST_F(CompilerOptionsBuilder, CompilerFlagsFiltering_CLanguageVersionIsRewritten)
{
ProjectPart part = projectPart;
part.compilerFlags = QStringList{"-std=c18"};
// We need to set the language version here to overcome a QTC_ASSERT checking
// consistency between ProjectFile::Kind and ProjectPart::LanguageVersion
part.languageVersion = Utils::LanguageVersion::C18;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{part,
CppTools::UseSystemHeader::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
CppTools::UseTweakedHeaderPaths::No,
Clang: Forward compiler options for gcc/clang Rely on clang to do the "right thing" with them. Change-Id: I44adf2cd5c61549896da3fc9b7c35c2fb0142060 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-08 16:22:39 +01:00
CppTools::UseLanguageDefines::Yes};
compilerOptionsBuilder.build(ProjectFile::CSource, CppTools::UsePrecompiledHeaders::No);
ASSERT_THAT(compilerOptionsBuilder.options(), Not(Contains(part.compilerFlags.first())));
ASSERT_THAT(compilerOptionsBuilder.options(), Contains("-std=c17"));
}
TEST_F(CompilerOptionsBuilder, CompilerFlagsFiltering_LanguageVersionIsExplicitlySetIfNotProvided)
{
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart,
CppTools::UseSystemHeader::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
CppTools::UseTweakedHeaderPaths::No,
Clang: Forward compiler options for gcc/clang Rely on clang to do the "right thing" with them. Change-Id: I44adf2cd5c61549896da3fc9b7c35c2fb0142060 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-08 16:22:39 +01:00
CppTools::UseLanguageDefines::Yes};
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
ASSERT_THAT(compilerOptionsBuilder.options(), Contains("-std=c++17"));
}
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
TEST_F(CompilerOptionsBuilder, CompilerFlagsFiltering_ClLanguageVersionIsExplicitlySetIfNotProvided)
{
projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart,
CppTools::UseSystemHeader::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
CppTools::UseTweakedHeaderPaths::No,
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
CppTools::UseLanguageDefines::Yes};
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
ASSERT_THAT(compilerOptionsBuilder.options(), Contains("/std:c++17"));
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, AddWordWidth)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
compilerOptionsBuilder.addWordWidth();
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-m64"));
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, HeaderPathOptionsOrder)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart,
CppTools::UseSystemHeader::No,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No,
Clang: Allow to forward warnings flags from build system Change-Id: I47ebb1ce4f3b5544408eb1d0f891ed5090394282 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-31 10:16:28 +01:00
CppTools::UseBuildSystemWarnings::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
"dummy_version",
""};
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
compilerOptionsBuilder.addHeaderPathOptions();
ASSERT_THAT(compilerOptionsBuilder.options(),
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
ElementsAre("-nostdinc",
"-nostdinc++",
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-I", toNative("/tmp/path"),
"-I", toNative("/tmp/system_path"),
clang: Fix include/resource dir confusion The getClangResourceDirAndVersion() function in ClangTools could return the actual resource dir or the include dir, depending on the input. This mistake happened because of misleading names spread all around the code. Now the function returns what it says, and the other names are accurate as well. Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2 Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-24 10:46:58 +02:00
"-isystem", toNative(CLANG_INCLUDE_DIR ""),
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-isystem", toNative("/tmp/builtin_path")));
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
}
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
TEST_F(CompilerOptionsBuilder, HeaderPathOptionsOrderCl)
{
projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID;
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart,
CppTools::UseSystemHeader::No,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No,
Clang: Allow to forward warnings flags from build system Change-Id: I47ebb1ce4f3b5544408eb1d0f891ed5090394282 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-31 10:16:28 +01:00
CppTools::UseBuildSystemWarnings::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
"dummy_version",
""};
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
compilerOptionsBuilder.evaluateCompilerFlags();
compilerOptionsBuilder.addHeaderPathOptions();
ASSERT_THAT(compilerOptionsBuilder.options(),
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
ElementsAre("-nostdinc",
"-nostdinc++",
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-I", toNative("/tmp/path"),
"-I", toNative("/tmp/system_path"),
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
"/clang:-isystem",
clang: Fix include/resource dir confusion The getClangResourceDirAndVersion() function in ClangTools could return the actual resource dir or the include dir, depending on the input. This mistake happened because of misleading names spread all around the code. Now the function returns what it says, and the other names are accurate as well. Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2 Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-24 10:46:58 +02:00
"/clang:" + toNative(CLANG_INCLUDE_DIR ""),
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
"/clang:-isystem",
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"/clang:" + toNative("/tmp/builtin_path")));
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, UseSystemHeader)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart,
CppTools::UseSystemHeader::Yes,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No,
Clang: Allow to forward warnings flags from build system Change-Id: I47ebb1ce4f3b5544408eb1d0f891ed5090394282 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-31 10:16:28 +01:00
CppTools::UseBuildSystemWarnings::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
"dummy_version",
""};
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
compilerOptionsBuilder.addHeaderPathOptions();
ASSERT_THAT(compilerOptionsBuilder.options(),
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
ElementsAre("-nostdinc",
"-nostdinc++",
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-I", toNative("/tmp/path"),
"-isystem", toNative("/tmp/system_path"),
clang: Fix include/resource dir confusion The getClangResourceDirAndVersion() function in ClangTools could return the actual resource dir or the include dir, depending on the input. This mistake happened because of misleading names spread all around the code. Now the function returns what it says, and the other names are accurate as well. Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2 Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-24 10:46:58 +02:00
"-isystem", toNative(CLANG_INCLUDE_DIR ""),
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-isystem", toNative("/tmp/builtin_path")));
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
}
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
TEST_F(CompilerOptionsBuilder, NoClangHeadersPath)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
compilerOptionsBuilder.addHeaderPathOptions();
ASSERT_THAT(compilerOptionsBuilder.options(),
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
ElementsAre("-I", toNative("/tmp/path"),
"-I", toNative("/tmp/system_path")));
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, ClangHeadersAndCppIncludesPathsOrderMacOs)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
auto defaultPaths = projectPart.headerPaths;
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
projectPart.headerPaths = {
builtIn("/usr/include/c++/4.2.1"),
builtIn("/usr/include/c++/4.2.1/backward"),
builtIn("/usr/local/include"),
builtIn("/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/6.0/include"),
builtIn("/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include"),
builtIn("/usr/include")
};
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
projectPart.headerPaths.append(defaultPaths);
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart,
CppTools::UseSystemHeader::No,
CppTools: Split CppTools::UseBuiltin in two options ...for clarity. No behavior change. Change-Id: Id0334bc79b97a8ff53b37089e337530c9a01b1d4 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-11-30 12:15:07 +01:00
CppTools::UseTweakedHeaderPaths::Yes,
Clang: Unify CompilerOptionsBuilder options No behavior change. Sometimes we use "SkipX, sometimes "UseX". Unify to "UseX" as this is more natural to read. Change-Id: Ib08bdb4cde93ed55fdb9c855566b10a3933cae37 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-11-30 11:02:49 +01:00
CppTools::UseLanguageDefines::No,
Clang: Allow to forward warnings flags from build system Change-Id: I47ebb1ce4f3b5544408eb1d0f891ed5090394282 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-31 10:16:28 +01:00
CppTools::UseBuildSystemWarnings::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
"dummy_version",
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
"");
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
compilerOptionsBuilder.addHeaderPathOptions();
ASSERT_THAT(compilerOptionsBuilder.options(),
ElementsAre("-nostdinc",
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
"-nostdinc++",
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-I", toNative("/tmp/path"),
"-I", toNative("/tmp/system_path"),
"-isystem", toNative("/usr/include/c++/4.2.1"),
"-isystem", toNative("/usr/include/c++/4.2.1/backward"),
"-isystem", toNative("/usr/local/include"),
clang: Fix include/resource dir confusion The getClangResourceDirAndVersion() function in ClangTools could return the actual resource dir or the include dir, depending on the input. This mistake happened because of misleading names spread all around the code. Now the function returns what it says, and the other names are accurate as well. Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2 Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-24 10:46:58 +02:00
"-isystem", toNative(CLANG_INCLUDE_DIR ""),
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-isystem", toNative("/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include"),
"-isystem", toNative("/usr/include"),
"-isystem", toNative("/tmp/builtin_path")));
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, ClangHeadersAndCppIncludesPathsOrderLinux)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
projectPart.headerPaths = {
builtIn("/usr/include/c++/4.8"),
builtIn("/usr/include/c++/4.8/backward"),
builtIn("/usr/include/x86_64-linux-gnu/c++/4.8"),
builtIn("/usr/local/include"),
builtIn("/usr/lib/gcc/x86_64-linux-gnu/4.8/include"),
builtIn("/usr/include/x86_64-linux-gnu"),
builtIn("/usr/include"),
};
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
projectPart.toolChainTargetTriple = "x86_64-linux-gnu";
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart,
CppTools::UseSystemHeader::No,
CppTools: Split CppTools::UseBuiltin in two options ...for clarity. No behavior change. Change-Id: Id0334bc79b97a8ff53b37089e337530c9a01b1d4 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-11-30 12:15:07 +01:00
CppTools::UseTweakedHeaderPaths::Yes,
Clang: Unify CompilerOptionsBuilder options No behavior change. Sometimes we use "SkipX, sometimes "UseX". Unify to "UseX" as this is more natural to read. Change-Id: Ib08bdb4cde93ed55fdb9c855566b10a3933cae37 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-11-30 11:02:49 +01:00
CppTools::UseLanguageDefines::No,
Clang: Allow to forward warnings flags from build system Change-Id: I47ebb1ce4f3b5544408eb1d0f891ed5090394282 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-31 10:16:28 +01:00
CppTools::UseBuildSystemWarnings::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
"dummy_version",
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
"");
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
compilerOptionsBuilder.addHeaderPathOptions();
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
ASSERT_THAT(
compilerOptionsBuilder.options(),
ElementsAre(
"-nostdinc",
"-nostdinc++",
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-isystem", toNative("/usr/include/c++/4.8"),
"-isystem", toNative("/usr/include/c++/4.8/backward"),
"-isystem", toNative("/usr/include/x86_64-linux-gnu/c++/4.8"),
"-isystem", toNative("/usr/local/include"),
clang: Fix include/resource dir confusion The getClangResourceDirAndVersion() function in ClangTools could return the actual resource dir or the include dir, depending on the input. This mistake happened because of misleading names spread all around the code. Now the function returns what it says, and the other names are accurate as well. Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2 Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-24 10:46:58 +02:00
"-isystem", toNative(CLANG_INCLUDE_DIR ""),
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-isystem", toNative("/usr/lib/gcc/x86_64-linux-gnu/4.8/include"),
"-isystem", toNative("/usr/include/x86_64-linux-gnu"),
"-isystem", toNative("/usr/include")));
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
}
Clang: Fix C++ paths search in compiler options builder Take into account paths from MinGW and NDK Clang. Fixes: QTCREATORBUG-21540 Change-Id: I00906c75dc4ddeb92fe5942a0222285d8ce2eb9d Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-11-12 13:18:27 +01:00
TEST_F(CompilerOptionsBuilder, ClangHeadersAndCppIncludesPathsOrderNoVersion)
{
Clang: Always force the built-in includes order C++ includes must always come first, then clang resource directory and then everything else. This prevents both c++ standard headers and intrinsics issues. Change-Id: Ia21bfa2fe99884c9adf58f7ef6beba1bede1724b Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-12-05 10:36:24 +01:00
projectPart.headerPaths = {
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
builtIn("C:/mingw530/i686-w64-mingw32/include"),
builtIn("C:/mingw530/i686-w64-mingw32/include/c++"),
builtIn("C:/mingw530/i686-w64-mingw32/include/c++/i686-w64-mingw32"),
builtIn("C:/mingw530/i686-w64-mingw32/include/c++/backward"),
};
Clang: Fix C++ paths search in compiler options builder Take into account paths from MinGW and NDK Clang. Fixes: QTCREATORBUG-21540 Change-Id: I00906c75dc4ddeb92fe5942a0222285d8ce2eb9d Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-11-12 13:18:27 +01:00
projectPart.toolChainTargetTriple = "x86_64-w64-windows-gnu";
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart,
CppTools::UseSystemHeader::No,
CppTools: Split CppTools::UseBuiltin in two options ...for clarity. No behavior change. Change-Id: Id0334bc79b97a8ff53b37089e337530c9a01b1d4 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-11-30 12:15:07 +01:00
CppTools::UseTweakedHeaderPaths::Yes,
Clang: Unify CompilerOptionsBuilder options No behavior change. Sometimes we use "SkipX, sometimes "UseX". Unify to "UseX" as this is more natural to read. Change-Id: Ib08bdb4cde93ed55fdb9c855566b10a3933cae37 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-11-30 11:02:49 +01:00
CppTools::UseLanguageDefines::No,
Clang: Allow to forward warnings flags from build system Change-Id: I47ebb1ce4f3b5544408eb1d0f891ed5090394282 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-31 10:16:28 +01:00
CppTools::UseBuildSystemWarnings::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
"dummy_version",
Clang: Fix C++ paths search in compiler options builder Take into account paths from MinGW and NDK Clang. Fixes: QTCREATORBUG-21540 Change-Id: I00906c75dc4ddeb92fe5942a0222285d8ce2eb9d Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-11-12 13:18:27 +01:00
"");
compilerOptionsBuilder.addHeaderPathOptions();
Clang: Always force the built-in includes order C++ includes must always come first, then clang resource directory and then everything else. This prevents both c++ standard headers and intrinsics issues. Change-Id: Ia21bfa2fe99884c9adf58f7ef6beba1bede1724b Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-12-05 10:36:24 +01:00
ASSERT_THAT(
compilerOptionsBuilder.options(),
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
ElementsAre("-nostdinc",
"-nostdinc++",
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-isystem", toNative("C:/mingw530/i686-w64-mingw32/include/c++"),
"-isystem", toNative("C:/mingw530/i686-w64-mingw32/include/c++/i686-w64-mingw32"),
"-isystem", toNative("C:/mingw530/i686-w64-mingw32/include/c++/backward"),
clang: Fix include/resource dir confusion The getClangResourceDirAndVersion() function in ClangTools could return the actual resource dir or the include dir, depending on the input. This mistake happened because of misleading names spread all around the code. Now the function returns what it says, and the other names are accurate as well. Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2 Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-24 10:46:58 +02:00
"-isystem", toNative(CLANG_INCLUDE_DIR ""),
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-isystem", toNative("C:/mingw530/i686-w64-mingw32/include")));
Clang: Fix C++ paths search in compiler options builder Take into account paths from MinGW and NDK Clang. Fixes: QTCREATORBUG-21540 Change-Id: I00906c75dc4ddeb92fe5942a0222285d8ce2eb9d Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-11-12 13:18:27 +01:00
}
TEST_F(CompilerOptionsBuilder, ClangHeadersAndCppIncludesPathsOrderAndroidClang)
{
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
projectPart.headerPaths = {
builtIn("C:/Android/sdk/ndk-bundle/sysroot/usr/include/i686-linux-android"),
builtIn("C:/Android/sdk/ndk-bundle/sources/cxx-stl/llvm-libc++/include"),
builtIn("C:/Android/sdk/ndk-bundle/sources/android/support/include"),
builtIn("C:/Android/sdk/ndk-bundle/sources/cxx-stl/llvm-libc++abi/include"),
builtIn("C:/Android/sdk/ndk-bundle/sysroot/usr/include"),
};
Clang: Fix C++ paths search in compiler options builder Take into account paths from MinGW and NDK Clang. Fixes: QTCREATORBUG-21540 Change-Id: I00906c75dc4ddeb92fe5942a0222285d8ce2eb9d Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-11-12 13:18:27 +01:00
projectPart.toolChainTargetTriple = "i686-linux-android";
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart,
CppTools::UseSystemHeader::No,
CppTools: Split CppTools::UseBuiltin in two options ...for clarity. No behavior change. Change-Id: Id0334bc79b97a8ff53b37089e337530c9a01b1d4 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-11-30 12:15:07 +01:00
CppTools::UseTweakedHeaderPaths::Yes,
Clang: Unify CompilerOptionsBuilder options No behavior change. Sometimes we use "SkipX, sometimes "UseX". Unify to "UseX" as this is more natural to read. Change-Id: Ib08bdb4cde93ed55fdb9c855566b10a3933cae37 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-11-30 11:02:49 +01:00
CppTools::UseLanguageDefines::No,
Clang: Allow to forward warnings flags from build system Change-Id: I47ebb1ce4f3b5544408eb1d0f891ed5090394282 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-31 10:16:28 +01:00
CppTools::UseBuildSystemWarnings::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
"dummy_version",
Clang: Fix C++ paths search in compiler options builder Take into account paths from MinGW and NDK Clang. Fixes: QTCREATORBUG-21540 Change-Id: I00906c75dc4ddeb92fe5942a0222285d8ce2eb9d Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-11-12 13:18:27 +01:00
"");
compilerOptionsBuilder.addHeaderPathOptions();
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
ASSERT_THAT(compilerOptionsBuilder.options(),
ElementsAre("-nostdinc",
"-nostdinc++",
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-isystem", toNative("C:/Android/sdk/ndk-bundle/sources/cxx-stl/llvm-libc++/include"),
"-isystem", toNative("C:/Android/sdk/ndk-bundle/sources/cxx-stl/llvm-libc++abi/include"),
clang: Fix include/resource dir confusion The getClangResourceDirAndVersion() function in ClangTools could return the actual resource dir or the include dir, depending on the input. This mistake happened because of misleading names spread all around the code. Now the function returns what it says, and the other names are accurate as well. Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2 Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-24 10:46:58 +02:00
"-isystem", toNative(CLANG_INCLUDE_DIR ""),
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-isystem", toNative("C:/Android/sdk/ndk-bundle/sysroot/usr/include/i686-linux-android"),
"-isystem", toNative("C:/Android/sdk/ndk-bundle/sources/android/support/include"),
"-isystem", toNative("C:/Android/sdk/ndk-bundle/sysroot/usr/include")));
Clang: Fix C++ paths search in compiler options builder Take into account paths from MinGW and NDK Clang. Fixes: QTCREATORBUG-21540 Change-Id: I00906c75dc4ddeb92fe5942a0222285d8ce2eb9d Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-11-12 13:18:27 +01:00
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, NoPrecompiledHeader)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
Clang: Clean up CompilerOptionsBuilder No behavior change. * Remove virtual from methods that are not overridden * Move constant member functions that do no access any members into source file as static functions * Remove QLatin1String where possible * Make variable names a bit more consistent * Other minor stuff Change-Id: I34a582d5a468489e11365507b283e9aee157664f Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-11-30 10:34:05 +01:00
compilerOptionsBuilder.addPrecompiledHeaderOptions(CppTools::UsePrecompiledHeaders::No);
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
ASSERT_THAT(compilerOptionsBuilder.options().empty(), true);
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, UsePrecompiledHeader)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
Clang: Clean up CompilerOptionsBuilder No behavior change. * Remove virtual from methods that are not overridden * Move constant member functions that do no access any members into source file as static functions * Remove QLatin1String where possible * Make variable names a bit more consistent * Other minor stuff Change-Id: I34a582d5a468489e11365507b283e9aee157664f Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-11-30 10:34:05 +01:00
compilerOptionsBuilder.addPrecompiledHeaderOptions(CppTools::UsePrecompiledHeaders::Yes);
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
ASSERT_THAT(compilerOptionsBuilder.options(),
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
ElementsAre("-include",
toNative(TESTDATA_DIR "/compileroptionsbuilder.pch")));
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
}
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
TEST_F(CompilerOptionsBuilder, UsePrecompiledHeaderCl)
{
projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart};
compilerOptionsBuilder.evaluateCompilerFlags();
compilerOptionsBuilder.addPrecompiledHeaderOptions(CppTools::UsePrecompiledHeaders::Yes);
ASSERT_THAT(compilerOptionsBuilder.options(),
ElementsAre("/FI",
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
toNative(TESTDATA_DIR "/compileroptionsbuilder.pch")));
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, AddMacros)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
compilerOptionsBuilder.addMacros(ProjectExplorer::Macros{ProjectExplorer::Macro{"key", "value"}});
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-Dkey=value"));
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, AddTargetTriple)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
compilerOptionsBuilder.addTargetTriple();
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("--target=x86_64-apple-darwin10"));
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
}
Revert "Clang: Stop enabling exceptions explicitly" This reverts commit b114f77d8a633341b617a5cadd04e5977beae65d as "--driver-mode=cl" apparently still disables exceptions. Task-number: QTCREATORBUG-23000 Change-Id: I9c49d971fafda5e1aca8445f8921e50f323d368f Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-12-19 11:58:24 +01:00
TEST_F(CompilerOptionsBuilder, EnableCExceptions)
{
projectPart.languageVersion = Utils::LanguageVersion::C99;
compilerOptionsBuilder.enableExceptions();
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-fexceptions"));
}
TEST_F(CompilerOptionsBuilder, EnableCXXExceptions)
{
compilerOptionsBuilder.enableExceptions();
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-fcxx-exceptions", "-fexceptions"));
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, InsertWrappedQtHeaders)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart,
CppTools::UseSystemHeader::Yes,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No,
Clang: Allow to forward warnings flags from build system Change-Id: I47ebb1ce4f3b5544408eb1d0f891ed5090394282 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-31 10:16:28 +01:00
CppTools::UseBuildSystemWarnings::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
"dummy_version",
""};
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
compilerOptionsBuilder.insertWrappedQtHeaders();
ASSERT_THAT(compilerOptionsBuilder.options(), Contains(IsPartOfHeader("wrappedQtHeaders")));
}
Clang: Fix error when including float.h with mingw Prevent mingw from trying to #include_next a private header from a path we cannot add to our list of includes. Fixes: QTCREATORBUG-24251 Task-number: QTCREATORBUG-24027 Change-Id: I18a9db130b9c2265cd208c3506d08d2e1c4cee45 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-07-09 09:44:39 +02:00
TEST_F(CompilerOptionsBuilder, InsertWrappedMingwHeadersWithNonMingwToolchain)
{
CppTools::CompilerOptionsBuilder builder{
projectPart,
CppTools::UseSystemHeader::Yes,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No,
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
""};
builder.insertWrappedMingwHeaders();
ASSERT_THAT(builder.options(), Not(Contains(IsPartOfHeader("wrappedMingwHeaders"))));
}
TEST_F(CompilerOptionsBuilder, InsertWrappedMingwHeadersWithMingwToolchain)
{
CppTools::CompilerOptionsBuilder builder{
projectPart,
CppTools::UseSystemHeader::Yes,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No,
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
""};
projectPart.toolchainType = ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID;
builder.insertWrappedMingwHeaders();
ASSERT_THAT(builder.options(), Contains(IsPartOfHeader("wrappedMingwHeaders")));
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, SetLanguageVersion)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
Clang: Minor cleanups in CompilerOptionsBuilder Change-Id: Iaf5af70136bceed52d19622c01d9d7147e5abeea Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-09 13:56:00 +01:00
compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource);
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-x", "c++"));
}
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
TEST_F(CompilerOptionsBuilder, SetLanguageVersionCl)
{
projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart};
compilerOptionsBuilder.evaluateCompilerFlags();
compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource);
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("/TP"));
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, HandleLanguageExtension)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
Utils: Move C++ language details from ProjectExplorer to Utils We want to use them in the backend processes too so it's nice to share them in Utils. A concrete size was added too because they should be serialized. Change-Id: Id5eb8f46643d5159f034fc9559f68a08d7e5847a Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-09 18:31:20 +01:00
projectPart.languageExtensions = Utils::LanguageExtension::ObjectiveC;
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
Clang: Minor cleanups in CompilerOptionsBuilder Change-Id: Iaf5af70136bceed52d19622c01d9d7147e5abeea Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-09 13:56:00 +01:00
compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource);
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-x", "objective-c++"));
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, UpdateLanguageVersion)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
Clang: Minor cleanups in CompilerOptionsBuilder Change-Id: Iaf5af70136bceed52d19622c01d9d7147e5abeea Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-09 13:56:00 +01:00
compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource);
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
Clang: Minor cleanups in CompilerOptionsBuilder Change-Id: Iaf5af70136bceed52d19622c01d9d7147e5abeea Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-09 13:56:00 +01:00
compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXHeader);
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-x", "c++-header"));
}
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
TEST_F(CompilerOptionsBuilder, UpdateLanguageVersionCl)
{
projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart};
compilerOptionsBuilder.evaluateCompilerFlags();
compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource);
compilerOptionsBuilder.updateFileLanguage(ProjectFile::CSource);
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("/TC"));
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, AddMsvcCompatibilityVersion)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID;
projectPart.toolChainMacros.append(ProjectExplorer::Macro{"_MSC_FULL_VER", "190000000"});
compilerOptionsBuilder.addMsvcCompatibilityVersion();
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-fms-compatibility-version=19.00"));
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, UndefineCppLanguageFeatureMacrosForMsvc2015)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID;
projectPart.isMsvc2015Toolchain = true;
compilerOptionsBuilder.undefineCppLanguageFeatureMacrosForMsvc2015();
ASSERT_THAT(compilerOptionsBuilder.options(), Contains(QString{"-U__cpp_aggregate_bases"}));
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, AddDefineFunctionMacrosMsvc)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID;
compilerOptionsBuilder.addDefineFunctionMacrosMsvc();
ASSERT_THAT(compilerOptionsBuilder.options(), Contains(QString{"-D__FUNCTION__=\"\""}));
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, AddProjectConfigFileInclude)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
projectPart.projectConfigFile = "dummy_file.h";
compilerOptionsBuilder.addProjectConfigFileInclude();
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-include", "dummy_file.h"));
}
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
TEST_F(CompilerOptionsBuilder, AddProjectConfigFileIncludeCl)
{
projectPart.projectConfigFile = "dummy_file.h";
projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart};
compilerOptionsBuilder.evaluateCompilerFlags();
compilerOptionsBuilder.addProjectConfigFileInclude();
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("/FI", "dummy_file.h"));
}
TEST_F(CompilerOptionsBuilder, NoUndefineClangVersionMacrosForNewMsvc)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID;
compilerOptionsBuilder.undefineClangVersionMacrosForMsvc();
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
ASSERT_THAT(compilerOptionsBuilder.options(), Not(Contains(QString{"-U__clang__"})));
}
TEST_F(CompilerOptionsBuilder, UndefineClangVersionMacrosForOldMsvc)
{
projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID;
projectPart.toolChainMacros = {ProjectExplorer::Macro{"_MSC_FULL_VER", "1300"},
ProjectExplorer::Macro{"_MSC_VER", "13"}};
compilerOptionsBuilder.undefineClangVersionMacrosForMsvc();
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
ASSERT_THAT(compilerOptionsBuilder.options(), Contains(QString{"-U__clang__"}));
}
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
TEST_F(CompilerOptionsBuilder, BuildAllOptions)
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
{
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
projectPart.extraCodeModelFlags = QStringList{"-arch", "x86_64"};
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart,
CppTools::UseSystemHeader::No,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No,
Clang: Allow to forward warnings flags from build system Change-Id: I47ebb1ce4f3b5544408eb1d0f891ed5090394282 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-31 10:16:28 +01:00
CppTools::UseBuildSystemWarnings::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
"dummy_version",
"");
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
Clang: Clean up CompilerOptionsBuilder No behavior change. * Remove virtual from methods that are not overridden * Move constant member functions that do no access any members into source file as static functions * Remove QLatin1String where possible * Make variable names a bit more consistent * Other minor stuff Change-Id: I34a582d5a468489e11365507b283e9aee157664f Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-11-30 10:34:05 +01:00
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
ASSERT_THAT(compilerOptionsBuilder.options(),
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
ElementsAre("-nostdinc",
"-nostdinc++",
Clang: Ensure that platform codegen flags get also filtered Leave the function addExtraCodeModelFlags() around as it's used by ClangPchManager::ProjectUpdater::toolChainArguments(). This allows us to filter out excess target arguments in a follow-up change. Change-Id: I742d713dd1ca6c391ba77c52555dcf4e94cc2ff9 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 15:01:09 +02:00
"-arch",
"x86_64",
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
"-fsyntax-only",
"-m64",
"--target=x86_64-apple-darwin10",
"-x",
"c++",
"-std=c++17",
"-DprojectFoo=projectBar",
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-I", IsPartOfHeader("wrappedQtHeaders"),
"-I", IsPartOfHeader(toNative("wrappedQtHeaders/QtCore").toStdString()),
"-I", toNative("/tmp/path"),
"-I", toNative("/tmp/system_path"),
clang: Fix include/resource dir confusion The getClangResourceDirAndVersion() function in ClangTools could return the actual resource dir or the include dir, depending on the input. This mistake happened because of misleading names spread all around the code. Now the function returns what it says, and the other names are accurate as well. Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2 Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-24 10:46:58 +02:00
"-isystem", toNative(CLANG_INCLUDE_DIR ""),
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-isystem", toNative("/tmp/builtin_path")));
CompilerOptionsBuilder unit-tests Bonus: minor compiler options builder issues fixed. Change-Id: Ie25f8fad6729339de05f2bf9b614ceac873e2634 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-26 14:10:35 +02:00
}
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
TEST_F(CompilerOptionsBuilder, BuildAllOptionsCl)
{
projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID;
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart,
CppTools::UseSystemHeader::No,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No,
Clang: Allow to forward warnings flags from build system Change-Id: I47ebb1ce4f3b5544408eb1d0f891ed5090394282 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-01-31 10:16:28 +01:00
CppTools::UseBuildSystemWarnings::No,
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
"dummy_version",
"");
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
Clang: Add conditions for adding exceptions flag For GCC it can be deduced from the compiler flags, so no correction is needed. For MSVC it can be deduced from the detected defines. Amends 26693e82126de15145a04c3428a10f6c15120532. Change-Id: Ie4850f328a2afdb3e5158c58f8c30a2644d9c592 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-29 23:34:18 +03:00
ASSERT_THAT(compilerOptionsBuilder.options(),
ElementsAre("-nostdinc",
"-nostdinc++",
"--driver-mode=cl",
"/Zs",
"-m64",
"--target=x86_64-apple-darwin10",
"/TP",
"/std:c++17",
"-fms-compatibility-version=19.00",
"-DprojectFoo=projectBar",
"-D__FUNCSIG__=\"\"",
"-D__FUNCTION__=\"\"",
"-D__FUNCDNAME__=\"\"",
"-I", IsPartOfHeader("wrappedQtHeaders"),
"-I", IsPartOfHeader(toNative("wrappedQtHeaders/QtCore").toStdString()),
"-I", toNative("/tmp/path"),
"-I", toNative("/tmp/system_path"),
"/clang:-isystem",
Merge remote-tracking branch 'origin/4.13' into master Conflicts: share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RowSpecifics.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml Change-Id: Ie5deacd39ae4f3c0966e7cb41a8fd832dcefbb09
2020-09-03 11:17:12 +02:00
"/clang:" + toNative(CLANG_INCLUDE_DIR ""),
Clang: Add conditions for adding exceptions flag For GCC it can be deduced from the compiler flags, so no correction is needed. For MSVC it can be deduced from the detected defines. Amends 26693e82126de15145a04c3428a10f6c15120532. Change-Id: Ie4850f328a2afdb3e5158c58f8c30a2644d9c592 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-29 23:34:18 +03:00
"/clang:-isystem",
"/clang:" + toNative("/tmp/builtin_path")));
}
TEST_F(CompilerOptionsBuilder, BuildAllOptionsClWithExceptions)
{
projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID;
projectPart.toolChainMacros.append(ProjectExplorer::Macro{"_CPPUNWIND", "1"});
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart,
CppTools::UseSystemHeader::No,
CppTools::UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No,
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
"");
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
ASSERT_THAT(compilerOptionsBuilder.options(),
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
ElementsAre("-nostdinc",
"-nostdinc++",
"--driver-mode=cl",
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
"/Zs",
"-m64",
"--target=x86_64-apple-darwin10",
"/TP",
"/std:c++17",
Revert "Clang: Stop enabling exceptions explicitly" This reverts commit b114f77d8a633341b617a5cadd04e5977beae65d as "--driver-mode=cl" apparently still disables exceptions. Task-number: QTCREATORBUG-23000 Change-Id: I9c49d971fafda5e1aca8445f8921e50f323d368f Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-12-19 11:58:24 +01:00
"-fcxx-exceptions",
"-fexceptions",
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
"-fms-compatibility-version=19.00",
"-DprojectFoo=projectBar",
"-D__FUNCSIG__=\"\"",
"-D__FUNCTION__=\"\"",
"-D__FUNCDNAME__=\"\"",
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"-I", IsPartOfHeader("wrappedQtHeaders"),
"-I", IsPartOfHeader(toNative("wrappedQtHeaders/QtCore").toStdString()),
"-I", toNative("/tmp/path"),
"-I", toNative("/tmp/system_path"),
Clang: Support MSVC style of compiler flags Clang has MSVC compatible mode which works with MSVC style command line flags. When possible use the same flags (-I, -D, -U, etc.) and in other cases either replace by MSVC analog (for example use /FI instead of -include) or pass the argument with '/clang:' prefix (requires https://reviews.llvm.org/D53457). Change-Id: I95f33bed5dc8d9493895ed8d4359cdd70fc774b8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-11 15:32:12 +01:00
"/clang:-isystem",
clang: Fix include/resource dir confusion The getClangResourceDirAndVersion() function in ClangTools could return the actual resource dir or the include dir, depending on the input. This mistake happened because of misleading names spread all around the code. Now the function returns what it says, and the other names are accurate as well. Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2 Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-24 10:46:58 +02:00
"/clang:" + toNative(CLANG_INCLUDE_DIR ""),
Clang: Fix how tweaked header paths work We need to provide built-in includes only when we use tweaked headers. Also let's require Clang resource directory because it has to be placed on the specific position inside the built-in header paths. Change-Id: Id581238660c680725201de759216cf33f69f6cc7 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-01-17 15:27:36 +01:00
"/clang:-isystem",
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
"/clang:" + toNative("/tmp/builtin_path")));
Don't remove __cplusplus For the indexing we need all tool chain macros. Originally it was a fix because the C++ version of the project part and __cplusplus could be different but now they should be the same. They will be now removed in the compiler options builder. Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199 Task-number: QTCREATORBUG-21265 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 14:26:47 +02:00
}
Clang: Simplify include paths in tests * The paths on Linux are always "canonicalized" by GccToolChain::gccHeaderPaths(). Therefore, canonicalize the paths in the tests, soo. * Introduce some helper functions to shorten the code. * Do not break the strings literal paths as this complicates comparing them. Change-Id: I0fc8acde0e455a7974baae0d9fdffd3a4060ff74 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-11 09:41:52 +02:00
} // namespace
Copy Permalink