diff --git a/cmake/install/CMakeLists.txt b/cmake/install/CMakeLists.txt index e704e77996e..b39c205aea8 100644 --- a/cmake/install/CMakeLists.txt +++ b/cmake/install/CMakeLists.txt @@ -40,6 +40,7 @@ ENDIF() if(LMMS_HAVE_STK AND (LMMS_BUILD_WIN32 OR LMMS_BUILD_APPLE)) if(STK_RAWWAVE_ROOT) file(GLOB RAWWAVES "${STK_RAWWAVE_ROOT}/*.raw") + list(SORT RAWWAVES) install(FILES ${RAWWAVES} DESTINATION "${DATA_DIR}/stk/rawwaves") else() message(WARNING "Can't find STK rawwave root!") diff --git a/cmake/linux/CMakeLists.txt b/cmake/linux/CMakeLists.txt index df03ed9f217..a808edb1e96 100644 --- a/cmake/linux/CMakeLists.txt +++ b/cmake/linux/CMakeLists.txt @@ -10,6 +10,7 @@ endif() # Copy rawwaves into bundle file(GLOB RAWWAVES "${STK_RAWWAVE_ROOT}/*.raw") +list(SORT RAWWAVES) install(FILES ${RAWWAVES} DESTINATION share/stk) install(FILES launch_lmms.sh DESTINATION bin) diff --git a/cmake/linux/LinuxDeploy.cmake b/cmake/linux/LinuxDeploy.cmake index 0066eb1038b..f0c59fbe9f9 100644 --- a/cmake/linux/LinuxDeploy.cmake +++ b/cmake/linux/LinuxDeploy.cmake @@ -30,6 +30,7 @@ file(GLOB cleanup "${CPACK_BINARY_DIR}/lmms-*.json" "${CPACK_BINARY_DIR}/${LMMS}-*.AppImage" "${CPACK_BINARY_DIR}/${CPACK_PROJECT_NAME_UCASE}-*.AppImage" "${CPACK_BINARY_DIR}/install_manifest.txt") +list(SORT cleanup) file(REMOVE ${cleanup}) # Download linuxdeploy @@ -51,6 +52,7 @@ file(MAKE_DIRECTORY "${APP}/usr") # Setup AppDir structure (/usr/bin, /usr/lib, /usr/share... etc) file(GLOB files "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/*") +list(SORT files) foreach(_file ${files}) get_filename_component(_filename "${_file}" NAME) if(NOT _filename MATCHES ".AppDir") @@ -163,6 +165,7 @@ file(GLOB UNWANTED_LIBS "${APP}/usr/lib/optional/libcarla*" "${APP}/usr/lib/libjack*") +list(SORT UNWANTED_LIBS) foreach(_LIB UNWANTED_LIBS) file(REMOVE "${_LIB}") endforeach()