diff --git a/.github/workflows/create-release-artifacts.yml b/.github/workflows/create-release-artifacts.yml index fd6ddbd9..5c711e08 100644 --- a/.github/workflows/create-release-artifacts.yml +++ b/.github/workflows/create-release-artifacts.yml @@ -42,7 +42,8 @@ jobs: shell: cmd run: | call .github\scripts\msvc-env.bat ${{ matrix.bits }} - cmake -B build -G Ninja -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" -DCMAKE_C_FLAGS="/nologo" + cmake -B build -G Ninja -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" ^ + -DCMAKE_C_FLAGS="/nologo" -DCMAKE_INSTALL_BINDIR=. -DCPACK_COMPONENTS_ALL=binaries cmake --build build -- -k 0 - name: Package binaries working-directory: build diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 7d6f42fd..c9e4261f 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -201,7 +201,7 @@ jobs: run: | # ASan seems to be broken on Windows, so we disable it. call .github\scripts\msvc-env.bat ${{ matrix.bits }} cmake -B build -G Ninja --preset develop -DFETCHCONTENT_BASE_DIR="${{ env.DEPS_ROOT_DIR }}" ^ - -DSANITIZERS=OFF -DCMAKE_C_FLAGS="/nologo" + -DSANITIZERS=OFF -DCMAKE_C_FLAGS="/nologo" -DCMAKE_INSTALL_BINDIR=. -DCPACK_COMPONENTS_ALL=binaries cmake --build build -- -k 0 - name: Install shell: cmd diff --git a/CMakeLists.txt b/CMakeLists.txt index 30d106f5..2d57bd08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -245,5 +245,7 @@ set(CPACK_STRIP_FILES ON) # Only applies to binary packages, not sources. set(CPACK_VERBATIM_VARIABLES ON) set(CPACK_THREADS 0) # Use all available CPU cores. set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF) +set(CPACK_COMPONENTS_GROUPING ALL_COMPONENTS_IN_ONE) +set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) include(CPack)