[Cmake-commits] CMake branch, next, updated. v3.6.2-2658-g85863e9

[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  85863e9f451e9a829d6459a58901de59ac95bef0 (commit)
       via  50b27de4219e2afa665f31a505439e6b9526bb02 (commit)
      from  7a615de1c279b12dc0419571f4a6b1a82e1d9cdc (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=85863e9f451e9a829d6459a58901de59ac95bef0
commit 85863e9f451e9a829d6459a58901de59ac95bef0
Merge: 7a615de 50b27de
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 30 10:33:42 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 30 10:33:42 2016 -0400

    Merge topic 'aux_source_directory-sort' into next
    
    50b27de4 aux_source_directory: Sort results to make it deterministic


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50b27de4219e2afa665f31a505439e6b9526bb02
commit 50b27de4219e2afa665f31a505439e6b9526bb02
Author:     Junghyun Kim <jh0822.kim at samsung.com>
AuthorDate: Fri Sep 30 09:25:02 2016 +0900
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 30 10:30:15 2016 -0400

    aux_source_directory: Sort results to make it deterministic
    
    The change in commit v3.6.0-rc1~54^2 (file: Sort GLOB results to make it
    deterministic, 2016-05-14) makes sense for `aux_source_directory` too.
    
    Signed-off-by: Junghyun Kim <jh0822.kim at samsung.com>

diff --git a/Source/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx
index fed4d5b..6655911 100644
--- a/Source/cmAuxSourceDirectoryCommand.cxx
+++ b/Source/cmAuxSourceDirectoryCommand.cxx
@@ -32,6 +32,8 @@ bool cmAuxSourceDirectoryCommand::InitialPass(
     sourceListValue = def;
   }
 
+  std::vector<std::string> files;
+
   // Load all the files in the directory
   cmsys::Directory dir;
   if (dir.Load(tdir.c_str())) {
@@ -55,14 +57,16 @@ bool cmAuxSourceDirectoryCommand::InitialPass(
           // depends can be done
           cmSourceFile* sf = this->Makefile->GetOrCreateSource(fullname);
           sf->SetProperty("ABSTRACT", "0");
-          if (!sourceListValue.empty()) {
-            sourceListValue += ";";
-          }
-          sourceListValue += fullname;
+          files.push_back(fullname);
         }
       }
     }
   }
+  std::sort(files.begin(), files.end());
+  if (!sourceListValue.empty()) {
+    sourceListValue += ";";
+  }
+  sourceListValue += cmJoin(files, ";");
   this->Makefile->AddDefinition(args[1], sourceListValue.c_str());
   return true;
 }

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

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


hooks/post-receive
-- 
CMake