Move nsi file to binary directory

This commit is contained in:
Jonas Kvinge
2024-11-02 02:37:54 +01:00
parent 4f79b8692c
commit 7132b06d6a
2 changed files with 2 additions and 3 deletions

View File

@@ -1051,7 +1051,7 @@ jobs:
- name: Copy nsis files - name: Copy nsis files
working-directory: build working-directory: build
run: cp ${GITHUB_WORKSPACE}/dist/windows/*.nsi ${GITHUB_WORKSPACE}/dist/windows/*.nsh ${GITHUB_WORKSPACE}/dist/windows/*.ico . run: cp ${GITHUB_WORKSPACE}/dist/windows/*.nsh ${GITHUB_WORKSPACE}/dist/windows/*.ico .
- name: Copy COPYING license file - name: Copy COPYING license file
working-directory: build working-directory: build
@@ -1356,7 +1356,6 @@ jobs:
shell: cmd shell: cmd
working-directory: build working-directory: build
run: | run: |
copy ..\dist\windows\*.nsi .
copy ..\dist\windows\*.nsh . copy ..\dist\windows\*.nsh .
copy ..\dist\windows\*.ico . copy ..\dist\windows\*.ico .

2
dist/CMakeLists.txt vendored
View File

@@ -14,7 +14,7 @@ endif(APPLE)
if(WIN32) if(WIN32)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/windres.rc.in ${CMAKE_BINARY_DIR}/windres.rc) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/windres.rc.in ${CMAKE_BINARY_DIR}/windres.rc)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_BINARY_DIR}/strawberry.nsi @ONLY)
endif(WIN32) endif(WIN32)
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)