Merge pull request #2829 from jasp00/sort-glob

Sort lists generated from globbing expressions

CMakeLists.txt

@@ -456,6 +456,7 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DLMMS_DEBUG")
 FILE(REMOVE include/lmmsconfig.h)
 
 FILE(GLOB LMMS_INCLUDES "${CMAKE_SOURCE_DIR}/include/*.h")
+LIST(SORT LMMS_INCLUDES)
 
 # Get list of all committers from git history, ordered by number of commits
 FIND_PACKAGE(Git)
@@ -526,6 +527,7 @@ IF(LMMS_BUILD_WIN32)
 		FILE(GLOB ZASF_BINARIES
 			"${CMAKE_SOURCE_DIR}/extras/plugins/zynaddsubfx/zynaddsubfx.dll"
 			"${CMAKE_SOURCE_DIR}/extras/plugins/zynaddsubfx/remote_zynaddsubfx.exe")
+		LIST(SORT ZASF_BINARIES)
 		INSTALL(FILES "${ZASF_BINARIES}" DESTINATION "${PLUGIN_DIR}")
 	ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/extras")
 ENDIF(LMMS_BUILD_WIN32)

cmake/modules/InstallHelpers.cmake

@@ -23,6 +23,7 @@ ENDMACRO(LIST_CONTAINS)
 MACRO(INSTALL_DATA_SUBDIRS _subdir _wildcards)
 	FOREACH(_wildcard ${_wildcards})
 		FILE(GLOB_RECURSE files ${_wildcard})
+		LIST(SORT files)
 		SET(SUBDIRS)
 
 		FOREACH(_item ${files})
@@ -36,6 +37,7 @@ MACRO(INSTALL_DATA_SUBDIRS _subdir _wildcards)
 
 		FOREACH(_item ${SUBDIRS})
 			FILE(GLOB files "${_item}/${_wildcard}")
+			LIST(SORT files)
 			FOREACH(_file ${files})
 				INSTALL(FILES "${_file}" DESTINATION "${LMMS_DATA_DIR}/${_subdir}/${_item}/")
 			ENDFOREACH(_file ${files})

cmake/nsis/CMakeLists.txt

@@ -59,5 +59,6 @@ CONFIGURE_FILE("lmms.rc.in"             "${CMAKE_BINARY_DIR}/lmms.rc")
 CONFIGURE_FILE("zynaddsubfx.rc.in"      "${CMAKE_BINARY_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc")
 
 FILE(GLOB RAWWAVES "${CMAKE_INSTALL_PREFIX}/share/stk/rawwaves/*.raw")
+LIST(SORT RAWWAVES)
 INSTALL(FILES ${RAWWAVES} DESTINATION "${DATA_DIR}/stk/rawwaves")
 

data/backgrounds/CMakeLists.txt

@@ -1,2 +1,3 @@
 FILE(GLOB PNG_FILES *.png)
+LIST(SORT PNG_FILES)
 INSTALL(FILES ${PNG_FILES} DESTINATION "${LMMS_DATA_DIR}/backgrounds")

data/locale/CMakeLists.txt

@@ -22,6 +22,7 @@ SET(qm_targets "")
 SET(QM_FILES "")
 
 FILE(GLOB lmms_LOCALES ${CMAKE_CURRENT_SOURCE_DIR}/*.ts)
+LIST(SORT lmms_LOCALES)
 FOREACH(_ts_file ${lmms_LOCALES})
 	GET_FILENAME_COMPONENT(_ts_target "${_ts_file}" NAME)
 	STRING(REPLACE ".ts" ".qm" _qm_file "${_ts_file}")
@@ -49,6 +50,7 @@ ENDFOREACH(_item ${qm_targets})
 
 IF(LMMS_BUILD_WIN32)
 	FILE(GLOB QT_QM_FILES "${QT_TRANSLATIONS_DIR}/qt*[^h].qm")
+	LIST(SORT QT_QM_FILES)
 ENDIF(LMMS_BUILD_WIN32)
 
 INSTALL(FILES ${QM_FILES} ${QT_QM_FILES} DESTINATION "${LMMS_DATA_DIR}/locale")

data/wavetables/CMakeLists.txt

@@ -1,2 +1,3 @@
 FILE(GLOB WAVETABLES *.bin)
+LIST(SORT WAVETABLES)
 INSTALL(FILES ${WAVETABLES} DESTINATION "${LMMS_DATA_DIR}/wavetables")

plugins/LadspaEffect/calf/CMakeLists.txt

@@ -1,4 +1,5 @@
 FILE(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
+LIST(SORT SOURCES)
 ADD_LIBRARY(calf MODULE ${SOURCES})
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include"
                     "${CMAKE_BINARY_DIR}"

plugins/LadspaEffect/caps/CMakeLists.txt

@@ -1,5 +1,6 @@
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
 FILE(GLOB SOURCES *.cc)
+LIST(SORT SOURCES)
 ADD_LIBRARY(caps MODULE ${SOURCES})
 INSTALL(TARGETS caps LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa")
 IF(LMMS_BUILD_WIN64)

plugins/LadspaEffect/cmt/CMakeLists.txt

@@ -1,5 +1,6 @@
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
 FILE(GLOB_RECURSE SOURCES src/*.cpp)
+LIST(SORT SOURCES)
 ADD_LIBRARY(cmt MODULE ${SOURCES})
 INSTALL(TARGETS cmt LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa")
 

plugins/LadspaEffect/swh/CMakeLists.txt

@@ -5,6 +5,7 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include"
                     "${CMAKE_BINARY_DIR}")
 LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS})
 FILE(GLOB PLUGIN_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.c")
+LIST(SORT PLUGIN_SOURCES)
 
 FOREACH(_item ${PLUGIN_SOURCES})
 	GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE)
@@ -49,6 +50,7 @@ TARGET_LINK_LIBRARIES(lowpass_iir_1891 iir)
 TARGET_LINK_LIBRARIES(notch_iir_1894 iir)
 
 FILE(GLOB GSM_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/gsm/*.c")
+LIST(SORT GSM_SOURCES)
 ADD_LIBRARY(gsm STATIC ${GSM_SOURCES})
 SET_TARGET_PROPERTIES(gsm PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}")
 TARGET_LINK_LIBRARIES(gsm_1215 gsm)

plugins/LadspaEffect/tap/CMakeLists.txt

@@ -1,5 +1,6 @@
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
 FILE(GLOB PLUGIN_SOURCES *.c)
+LIST(SORT PLUGIN_SOURCES)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wno-write-strings -fomit-frame-pointer -fno-strict-aliasing -fstrength-reduce -funroll-loops -ffast-math")
 FOREACH(_item ${PLUGIN_SOURCES})
 	GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE)