[Cmake-commits] CMake branch, next, updated. v3.6.1-1497-g037fa07

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  037fa07721e5c990f30e8116d987916d87fddd56 (commit)
       via  38995d19b806e8cc1d43fab0422beefd4c23431f (commit)
      from  7184f486f54f39fd1584a876ca67c27da07e97b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=037fa07721e5c990f30e8116d987916d87fddd56
commit 037fa07721e5c990f30e8116d987916d87fddd56
Merge: 7184f48 38995d1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 26 09:56:19 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 26 09:56:19 2016 -0400

    Merge topic 'code-blocks-include-order' into next
    
    38995d19 CodeBlocks: List C++ includes first


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38995d19b806e8cc1d43fab0422beefd4c23431f
commit 38995d19b806e8cc1d43fab0422beefd4c23431f
Author:     Kevin Ottens <ervin at kde.org>
AuthorDate: Wed Aug 17 22:45:06 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 26 09:55:30 2016 -0400

    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.

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);

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExtraCodeBlocksGenerator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake