Coerce NSIS to copy resources

tresf · Mar 3, 2025 · c6b7cfa · c6b7cfa
1 parent 1c0ac26
commit c6b7cfa
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/cmake/nsis/CMakeLists.txt b/cmake/nsis/CMakeLists.txt
@@ -6,7 +6,7 @@ endif()
 # the final slash needs to be flipped for CPACK_PACKAGE_ICON to work:
 #   https://cmake.org/pipermail/cmake/2008-June/022085.html
 SET(CPACK_PACKAGE_ICON                  "${CMAKE_SOURCE_DIR}/cmake/nsis\\\\banner.bmp")
-SET(CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP "${CMAKE_SOURCE_DIR}/cmake/nsis\\\\welcome.bmp")
+SET(CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP "${CMAKE_SOURCE_DIR}/cmake/nsis\\\\welcome.bmp" PARENT_SCOPE)
 SET(CPACK_NSIS_MUI_ICON                 "${CMAKE_SOURCE_DIR}/cmake/nsis/lmms.ico")
 SET(CPACK_NSIS_INSTALLED_ICON_NAME      "${CMAKE_PROJECT_NAME}.exe" PARENT_SCOPE)
 SET(CPACK_NSIS_DISPLAY_NAME             "${PROJECT_NAME_UCASE} ${VERSION}" PARENT_SCOPE)
@@ -27,7 +27,7 @@ SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS   "
   \\\${IfNot} \\\${AtMostWin7}
     WriteRegDWORD HKLM \\\"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\SideBySide\\\" \\\"PreferExternalManifest\\\" \\\"1\\\"
   \\\${EndIf}
-  " PARENT_SCOPE)
+  ")
 SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
   \\\${unregisterExtension} \\\".mmp\\\" \\\"${PROJECT_NAME_UCASE} Project\\\"
   \\\${unregisterExtension} \\\".mmpz\\\" \\\"${PROJECT_NAME_UCASE} Project (compressed)\\\"
@@ -48,12 +48,23 @@ IF(WIN64)
 		")
 ENDIF()
 
+# Handle optional branding
+if(LMMS_DYNAMIC_BRANDING)
+	# See also src/CMakeLists.txt for winrc steps
+	set(CPACK_NSIS_MUI_ICON "${CPACK_BRANDED_OUTPUT}/lmms.ico")
+	set(CPACK_PACKAGE_ICON "${CPACK_BRANDED_OUTPUT}\\\\banner.bmp")
+	# Overwrite any branded files
+	set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}
+  File /r /x lmms.ico /x banner.bmp \\\"${CPACK_BRANDED_OUTPUT}\\\\*.*\\\"
+	")
+endif()
+
 # Setup missing parent scopes
 SET(CPACK_PACKAGE_FILE_NAME             "${CPACK_PACKAGE_FILE_NAME}" PARENT_SCOPE)
 SET(CPACK_NSIS_DEFINES                  "${CPACK_NSIS_DEFINES}" PARENT_SCOPE)
 SET(CPACK_PACKAGE_ICON                  "${CPACK_PACKAGE_ICON}" PARENT_SCOPE)
 SET(CPACK_NSIS_MUI_ICON                 "${CPACK_NSIS_MUI_ICON}" PARENT_SCOPE)
-SET(CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP "${CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP}" PARENT_SCOPE)
+SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS   "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE)
 
 # Disable cpack's strip for historic reasons
 set(CPACK_STRIP_FILES_ORIG "${CPACK_STRIP_FILES}" PARENT_SCOPE)
@@ -64,17 +75,6 @@ if(CPACK_DEBUG)
 	set(CPACK_NSIS_EXECUTABLE_PRE_ARGUMENTS "-V4")
 endif()
 
-# Handle optional branding
-if(LMMS_DYNAMIC_BRANDING)
-	# See also src/CMakeLists.txt for winrc steps
-	set(CPACK_NSIS_MUI_ICON "${CPACK_BRANDED_OUTPUT}/lmms.ico" PARENT_SCOPE)
-	set(CPACK_PACKAGE_ICON "${CPACK_BRANDED_OUTPUT}\\\\banner.bmp" PARENT_SCOPE)
-	# Overwrite any branded files
-	set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}
-  File /r /x lmms.ico /x banner.bmp \\\"${CPACK_BRANDED_OUTPUT}\\\\*.*\\\"
-	")
-endif()
-
 # Windows resource compilers
 CONFIGURE_FILE("lmms.rc.in"             "${CMAKE_BINARY_DIR}/lmms.rc")
 CONFIGURE_FILE("zynaddsubfx.rc.in"      "${CMAKE_BINARY_DIR}/plugins/ZynAddSubFx/zynaddsubfx.rc")