Try to fix nsis again

tresf · Mar 1, 2025 · 7c4c578 · 7c4c578
1 parent 44f5a1c
commit 7c4c578
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 28 deletions.
diff --git a/cmake/apple/MacDeployQt.cmake b/cmake/apple/MacDeployQt.cmake
@@ -69,8 +69,11 @@ configure_file("${CPACK_CURRENT_SOURCE_DIR}/lmms.plist.in" "${APP}/Contents/Info
 file(COPY "${CPACK_CURRENT_SOURCE_DIR}/project.icns" DESTINATION "${APP}/Contents/Resources")
 file(COPY "${CPACK_CURRENT_SOURCE_DIR}/${lmms}.icns" DESTINATION "${APP}/Contents/Resources")
 
-# Copy optional branded files
-include(CPackBrandingSteps)
+# Overwrite any branded files
+file(GLOB branded_items "${CPACK_BRANDED_OUTPUT}/*")
+foreach(item "${branded_items}")
+	file(COPY "${item}" DESTINATION "${APP}")
+endforeach()
 
 # Copy Suil modules
 if(CPACK_SUIL_MODULES)

diff --git a/cmake/linux/LinuxDeploy.cmake b/cmake/linux/LinuxDeploy.cmake
@@ -125,8 +125,11 @@ file(COPY "${APP}/usr/share/icons/hicolor/256x256/apps/${lmms}.png" DESTINATION
 file(RENAME "${APP}/${lmms}.png" "${APP}/.DirIcon")
 file(COPY "${APP}/usr/share/icons/hicolor/256x256/apps/${lmms}.png" DESTINATION "${APP}")
 
-# Copy optional branded files
-include(CPackBrandingSteps)
+# Overwrite any branded files
+file(GLOB branded_items "${CPACK_BRANDED_OUTPUT}/*")
+foreach(item "${branded_items}")
+	file(COPY "${item}" DESTINATION "${APP}")
+endforeach()
 
 # Build list of libraries to inform linuxdeploy about
 # e.g. --library=foo.so --library=bar.so

diff --git a/cmake/modules/branding/CPackBrandingSteps.cmake b/cmake/modules/branding/CPackBrandingSteps.cmake
diff --git a/cmake/nsis/CMakeLists.txt b/cmake/nsis/CMakeLists.txt
@@ -64,8 +64,8 @@ endif()
 
 # Handle optional branding
 if(LMMS_DYNAMIC_BRANDING)
-	set(CPACK_INSTALL_COMMANDS "set(CPACK_BRANDED_OUTPUT \"${CPACK_BRANDED_OUTPUT}\")")
-	set(CPACK_INSTALL_SCRIPTS "${CMAKE_SOURCE_DIR}/cmake/modules/branding/CPackBrandingSteps.cmake")
+	# See also src/CMakeLists.txt for winrc steps
+	set(CPACK_NSIS_MUI_ICON "${CPACK_BRANDED_OUTPUT}/lmms.ico")
 endif()
 
 # Windows resource compilers