Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 23:07:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[host] fix nsis build failure to do invalid path to new VERSION file

Browse Source
This commit is contained in:
Geoffrey McRae 2020-10-09 02:36:48 +11:00
parent e6c88a4af3
commit e1d7752165
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
host/platform/Windows/CMakeLists.txt
View File

@ -38,5 +38,4 @@ target_include_directories(platform_Windows
# these are for the nsis installer generator # these are for the nsis installer generator
configure_file("${PROJECT_SOURCE_DIR}/installer.nsi" "${PROJECT_BINARY_DIR}/installer.nsi" COPYONLY) configure_file("${PROJECT_SOURCE_DIR}/installer.nsi" "${PROJECT_BINARY_DIR}/installer.nsi" COPYONLY)
configure_file("${PROJECT_TOP}/resources/icon.ico" "${PROJECT_BINARY_DIR}/icon.ico" COPYONLY) configure_file("${PROJECT_TOP}/resources/icon.ico" "${PROJECT_BINARY_DIR}/icon.ico" COPYONLY)
configure_file("${CMAKE_BINARY_DIR}/VERSION" "${PROJECT_BINARY_DIR}/VERSION" COPYONLY)
configure_file("${PROJECT_TOP}/LICENSE" "${PROJECT_BINARY_DIR}/LICENSE.txt" COPYONLY) configure_file("${PROJECT_TOP}/LICENSE" "${PROJECT_BINARY_DIR}/LICENSE.txt" COPYONLY)

2
host/platform/Windows/installer.nsi
View File

@ -36,7 +36,7 @@ InstallDir "$PROGRAMFILES64\Looking Glass (host)"
!define MUI_ICON "icon.ico" !define MUI_ICON "icon.ico"
!define MUI_UNICON "icon.ico" !define MUI_UNICON "icon.ico"
!define MUI_LICENSEPAGE_BUTTON "Agree" !define MUI_LICENSEPAGE_BUTTON "Agree"
!define /file VERSION "VERSION" !define /file VERSION "../../VERSION"
;Install and uninstall pages ;Install and uninstall pages
!insertmacro MUI_PAGE_LICENSE "LICENSE.txt" !insertmacro MUI_PAGE_LICENSE "LICENSE.txt"