From 7132b06d6a7543217696bd66d3aed4cd1ecdc52d Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 2 Nov 2024 02:37:54 +0100 Subject: [PATCH] Move nsi file to binary directory --- .github/workflows/build.yml | 3 +-- dist/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a47f27eed..e84a02a28 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1051,7 +1051,7 @@ jobs: - name: Copy nsis files 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 working-directory: build @@ -1356,7 +1356,6 @@ jobs: shell: cmd working-directory: build run: | - copy ..\dist\windows\*.nsi . copy ..\dist\windows\*.nsh . copy ..\dist\windows\*.ico . diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt index 8843e3bbf..82982baa5 100644 --- a/dist/CMakeLists.txt +++ b/dist/CMakeLists.txt @@ -14,7 +14,7 @@ endif(APPLE) if(WIN32) 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) if(UNIX AND NOT APPLE)