diff options
| author | Kevin Ottens <ervin@kde.org> | 2016-08-17 20:45:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-08-26 13:55:30 (GMT) |
| commit | 38995d19b806e8cc1d43fab0422beefd4c23431f (patch) | |
| tree | 24507eb2ea9bba6d827081c7f6b752d605dbe54c | |
| parent | 21c946eef4e11e6161cc46b265fbeb128ea1baf7 (diff) | |
| download | CMake-38995d19b806e8cc1d43fab0422beefd4c23431f.zip CMake-38995d19b806e8cc1d43fab0422beefd4c23431f.tar.gz CMake-38995d19b806e8cc1d43fab0422beefd4c23431f.tar.bz2 | |
CodeBlocks: List C++ includes first
When using the Clang Code Model in QtCreator, it turned out that having
the C system include dirs can make it report false positives for most
uses of the STL. This is due to the order the Clang Code Model looks at
the include directories and some C includes in /usr/include could be
incompatible with the used STL if found first.
| -rw-r--r-- | Source/cmExtraCodeBlocksGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 559974e..6eae26b 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -593,7 +593,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget( includes.end()); std::string systemIncludeDirs = makefile->GetSafeDefinition( - "CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS"); + "CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS"); if (!systemIncludeDirs.empty()) { std::vector<std::string> dirs; cmSystemTools::ExpandListArgument(systemIncludeDirs, dirs); @@ -601,7 +601,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget( } systemIncludeDirs = makefile->GetSafeDefinition( - "CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS"); + "CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS"); if (!systemIncludeDirs.empty()) { std::vector<std::string> dirs; cmSystemTools::ExpandListArgument(systemIncludeDirs, dirs); |