hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #2829 from jasp00/sort-glob

Browse Source 
Sort lists generated from globbing expressions
This commit is contained in:
Javier Serrano Polo
2016-07-01 02:56:01 +00:00
committed by GitHub
parent f3ea884697 5b2283feec
commit fb0e076bce
11 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/InstallHelpers.cmake
View File

@@ -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})

1
cmake/nsis/CMakeLists.txt
View File

@@ -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")