Skip to content
This repository has been archived by the owner on Dec 18, 2022. It is now read-only.

Commit

Permalink
[POC] use WIX CPack generator for Windows installer
Browse files Browse the repository at this point in the history
Signed-off-by: Be <[email protected]>
  • Loading branch information
Be-ing committed Sep 8, 2021
1 parent 3fe7938 commit 5305e86
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/cmake_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
MACOSX_DEPLOYMENT_TARGET: 10.12

# CMake settings
CMAKE_BUILD_TYPE: MinSizeRel
CMAKE_BUILD_TYPE: RelWithDebInfo
CMAKE_GENERATOR: ${{matrix.config.CMAKE_GENERATOR}}
CMAKE_GENERATOR_PLATFORM: ${{matrix.config.CMAKE_GENERATOR_PLATFORM}}

Expand Down Expand Up @@ -268,13 +268,9 @@ jobs:

- name: Package
run: |
if [[ "${{runner.os}}" == "Windows" ]]; then
cmake --build build --target innosetup --config ${{ env.CMAKE_BUILD_TYPE }}
else
cd build
cpack -C ${{ env.CMAKE_BUILD_TYPE }} -D CPACK_COMMAND_HDIUTIL=${{ env.CPACK_COMMAND_HDIUTIL }} --verbose
rm -r package/_CPack_Packages
fi
cd build
cpack -C ${{ env.CMAKE_BUILD_TYPE }} -D CPACK_COMMAND_HDIUTIL=${{ env.CPACK_COMMAND_HDIUTIL }} --verbose
rm -r package/_CPack_Packages
env:
# Workaround for CPack hdiutil/ finder service race condition bug
CPACK_COMMAND_HDIUTIL: ${{ github.workspace }}/scripts/ci/macos/repeat_hdiutil.sh
Expand Down
2 changes: 2 additions & 0 deletions cmake-proxies/cmake-modules/Package.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ elseif( CMAKE_SYSTEM_NAME STREQUAL "Darwin" )
# CPACK_POST_BUILD_SCRIPTS was added in 3.19, but we only need it on macOS
SET( CPACK_POST_BUILD_SCRIPTS "${CMAKE_SOURCE_DIR}/scripts/build/macOS/DMGSign.cmake" )
endif()
elseif(WIN32)
set( CPACK_GENERATOR WIX )
endif()

include(CPack) # do this last

0 comments on commit 5305e86

Please sign in to comment.