From 5626a49704f00088593817ffebe20d11a5f1e386 Mon Sep 17 00:00:00 2001
From: Javier Serrano Polo <javier--IfwAyVwL9S8xJKrdU2QtlAdbjyPl9T@jasp.net>
Date: Sat, 10 Sep 2016 02:31:35 +0000
Subject: [PATCH] Sort plug-in embedded resources (#3014)

---
 cmake/modules/BuildPlugin.cmake | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake
index 7fa7c4cb5..a107ef5ac 100644
--- a/cmake/modules/BuildPlugin.cmake
+++ b/cmake/modules/BuildPlugin.cmake
@@ -13,6 +13,18 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 
 	LIST(LENGTH PLUGIN_EMBEDDED_RESOURCES ER_LEN)
 	IF(ER_LEN)
+		# Expand and sort arguments to avoid locale dependent sorting in
+		# shell
+		SET(NEW_ARGS)
+		FOREACH(ARG ${PLUGIN_EMBEDDED_RESOURCES})
+			FILE(GLOB EXPANDED "${ARG}")
+			LIST(SORT EXPANDED)
+			FOREACH(ITEM ${EXPANDED})
+				LIST(APPEND NEW_ARGS ${ITEM})
+			ENDFOREACH()
+		ENDFOREACH()
+		SET(PLUGIN_EMBEDDED_RESOURCES ${NEW_ARGS})
+
 		SET(ER_H ${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h)
 		ADD_CUSTOM_COMMAND(OUTPUT ${ER_H}
 			COMMAND ${BIN2RES}