Merge pull request #1817 from HEXRD/fix-windows-packaging

psavery · web-flow · commit a1eec8ffeaa5 · 2025-04-01T13:01:05.000-05:00
Fix Windows packaging variable expansion
diff --git a/packaging/CPackConfig.cmake b/packaging/CPackConfig.cmake
@@ -40,15 +40,15 @@ elseif(WIN32)
     )
 
   set(CPACK_WIX_PRODUCT_ICON
-    "@CMAKE_CURRENT_LIST_DIR@/hexrd.ico"
+    "${CMAKE_CURRENT_LIST_DIR}/hexrd.ico"
     )
 
   set(CPACK_WIX_UI_BANNER
-    "@CMAKE_CURRENT_LIST_DIR@/hexrd_wix_ui_banner.png"
+    "${CMAKE_CURRENT_LIST_DIR}/hexrd_wix_ui_banner.png"
     )
 
   set(CPACK_WIX_UI_DIALOG
-    "@CMAKE_CURRENT_LIST_DIR@/hexrd_wix_ui_dialog.png"
+    "${CMAKE_CURRENT_LIST_DIR}/hexrd_wix_ui_dialog.png"
     )
 
   set(CPACK_WIX_UPGRADE_GUID "5F369ED0-05D7-4CBA-B533-D1A1B3F445C3")

Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,15 @@ elseif(WIN32)`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`set(CPACK_WIX_PRODUCT_ICON`
`43`		`- "@CMAKE_CURRENT_LIST_DIR@/hexrd.ico"`
	`43`	`+ "${CMAKE_CURRENT_LIST_DIR}/hexrd.ico"`
`44`	`44`	`)`
`45`	`45`
`46`	`46`	`set(CPACK_WIX_UI_BANNER`
`47`		`- "@CMAKE_CURRENT_LIST_DIR@/hexrd_wix_ui_banner.png"`
	`47`	`+ "${CMAKE_CURRENT_LIST_DIR}/hexrd_wix_ui_banner.png"`
`48`	`48`	`)`
`49`	`49`
`50`	`50`	`set(CPACK_WIX_UI_DIALOG`
`51`		`- "@CMAKE_CURRENT_LIST_DIR@/hexrd_wix_ui_dialog.png"`
	`51`	`+ "${CMAKE_CURRENT_LIST_DIR}/hexrd_wix_ui_dialog.png"`
`52`	`52`	`)`
`53`	`53`
`54`	`54`	`set(CPACK_WIX_UPGRADE_GUID "5F369ED0-05D7-4CBA-B533-D1A1B3F445C3")`