[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-342-g590681a

[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  590681ade20a66d7ec2750c4acd510dcdad26e3e (commit)
       via  f190b069db2e430fd94b25e6287cd7fbc28661e3 (commit)
      from  18ebcf28426e7d5b80b5005d1505588566009697 (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=590681ade20a66d7ec2750c4acd510dcdad26e3e
commit 590681ade20a66d7ec2750c4acd510dcdad26e3e
Merge: 18ebcf2 f190b06
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 16 10:03:33 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 16 10:03:33 2016 -0400

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f190b069db2e430fd94b25e6287cd7fbc28661e3
commit f190b069db2e430fd94b25e6287cd7fbc28661e3
Author:     Tobias Hunger <tobias.hunger at qt.io>
AuthorDate: Tue Jun 14 17:16:57 2016 +0200
Commit:     Tobias Hunger <tobias.hunger at qt.io>
CommitDate: Tue Jun 14 17:50:20 2016 +0200

    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 8c656b9..7bd0012 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:
 Source/cmExtraCodeBlocksGenerator.cxx |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake