From c528dfdf42bd3e6042bed0444813a8a7659b669a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 7 Jun 2026 23:47:35 +0200 Subject: [PATCH] cmake: limit CPack generator to TGZ To avoid building NSIS packages, which seems not super useful, and breaks without NSIS (as seen in CI). Do what curl does and restrict CPack to TGZ. Follow-up to 04ecdb22fe9b092ba49f1562b5f79a9acdeedb8b #1972 Closes #1996 --- .github/workflows/ci.yml | 3 --- CMakeLists.txt | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de1a8a30..96313477 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -979,9 +979,6 @@ jobs: else system='Windows' fi - if [[ "${MATRIX_IMAGE}" = *'windows-2025'* ]]; then - options+=' -DCPACK_GENERATOR=TGZ' - fi [ "${MATRIX_CRYPTO}" = 'WinCNG' ] && options+=" -DENABLE_ECDSA_WINCNG=${MATRIX_WINCND_ECDSA}" cmake -B bld ${options} \ -DCMAKE_SYSTEM_NAME="${system}" \ diff --git a/CMakeLists.txt b/CMakeLists.txt index fc267a78..634ec5ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -584,4 +584,5 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${LIBSSH2_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${LIBSSH2_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${LIBSSH2_VERSION_PATCH}) set(CPACK_PACKAGE_VERSION ${LIBSSH2_VERSION}) +set(CPACK_GENERATOR "TGZ") include(CPack)