From 50b27de4219e2afa665f31a505439e6b9526bb02 Mon Sep 17 00:00:00 2001
From: Junghyun Kim <jh0822.kim@samsung.com>
Date: Fri, 30 Sep 2016 09:25:02 +0900
Subject: [PATCH] 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@samsung.com>
---
 Source/cmAuxSourceDirectoryCommand.cxx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Source/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx
index fed4d5b73..665591185 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;
 }