[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-360-gd932507

[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  d932507155630bde86637e87ec7fb75a45606c37 (commit)
       via  76b462eacba7fd66608a0956dbf89dab4457b8ba (commit)
      from  ef0d8c3e5f5d46a183d9a65b38d05ccff8c991dc (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=d932507155630bde86637e87ec7fb75a45606c37
commit d932507155630bde86637e87ec7fb75a45606c37
Merge: ef0d8c3 76b462e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 17 10:37:43 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 17 10:37:43 2016 -0400

    Merge topic 'CodeBlocks-include-order' into next
    
    76b462ea cmExtraCodeBlocksGenerator: Do not shuffle include directories


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76b462eacba7fd66608a0956dbf89dab4457b8ba
commit 76b462eacba7fd66608a0956dbf89dab4457b8ba
Author:     Tobias Hunger <tobias.hunger at qt.io>
AuthorDate: Tue Jun 14 17:16:57 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 17 10:37:29 2016 -0400

    cmExtraCodeBlocksGenerator: Do not shuffle include directories
    
    Report include directories in a sensible order. Do not shuffle them
    when trying to make them unique.

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 2070b1f..589bf53 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -578,19 +578,20 @@ void cmExtraCodeBlocksGenerator::AppendTarget(
     }
 
     // the include directories for this target
-    std::set<std::string> uniqIncludeDirs;
+    std::vector<std::string> allIncludeDirs;
 
     std::vector<std::string> includes;
     lg->GetIncludeDirectories(includes, target, "C", buildType);
 
-    uniqIncludeDirs.insert(includes.begin(), includes.end());
+    allIncludeDirs.insert(allIncludeDirs.end(), includes.begin(),
+                          includes.end());
 
     std::string systemIncludeDirs = makefile->GetSafeDefinition(
       "CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS");
     if (!systemIncludeDirs.empty()) {
       std::vector<std::string> dirs;
       cmSystemTools::ExpandListArgument(systemIncludeDirs, dirs);
-      uniqIncludeDirs.insert(dirs.begin(), dirs.end());
+      allIncludeDirs.insert(allIncludeDirs.end(), dirs.begin(), dirs.end());
     }
 
     systemIncludeDirs = makefile->GetSafeDefinition(
@@ -598,13 +599,16 @@ void cmExtraCodeBlocksGenerator::AppendTarget(
     if (!systemIncludeDirs.empty()) {
       std::vector<std::string> dirs;
       cmSystemTools::ExpandListArgument(systemIncludeDirs, dirs);
-      uniqIncludeDirs.insert(dirs.begin(), dirs.end());
+      allIncludeDirs.insert(allIncludeDirs.end(), dirs.begin(), dirs.end());
     }
 
-    for (std::set<std::string>::const_iterator dirIt = uniqIncludeDirs.begin();
-         dirIt != uniqIncludeDirs.end(); ++dirIt) {
+    std::vector<std::string>::const_iterator end =
+      cmRemoveDuplicates(allIncludeDirs);
+
+    for (std::vector<std::string>::const_iterator i = allIncludeDirs.begin();
+         i != end; ++i) {
       xml.StartElement("Add");
-      xml.Attribute("directory", *dirIt);
+      xml.Attribute("directory", *i);
       xml.EndElement();
     }
 

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

Summary of changes:


hooks/post-receive
-- 
CMake