From 0efac9a09d5b9ad2dd83dc047904780b41d18b37 Mon Sep 17 00:00:00 2001 From: Richard Ore Date: Wed, 18 Sep 2024 16:34:58 +0100 Subject: [PATCH] updates to cmake build for windows --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c0fe3a0..5b937ec4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,7 +88,7 @@ jobs: ${{ env.VCPKG_ROOT }}/vcpkg list - name: Compile run: | - cmake -B . -G "Unix Makefiles" -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" + cmake -B . -G "Unix Makefiles" -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows-static cmake --build . -- -j 12 - name: Test run: ctest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5340acdd..75821d26 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,11 +89,11 @@ jobs: run: | ${{ env.VCPKG_ROOT }}/vcpkg update ${{ env.VCPKG_ROOT }}/vcpkg version - ${{ env.VCPKG_ROOT }}/vcpkg install curl:x64-windows libffi:x64-windows openssl:x64-windows-static libpng:x64-windows libjpeg-turbo:x64-windows + ${{ env.VCPKG_ROOT }}/vcpkg install curl:x64-windows libffi:x64-windows openssl:x64-windows libpng:x64-windows libjpeg-turbo:x64-windows ${{ env.VCPKG_ROOT }}/vcpkg list - name: Compile run: | - cmake -B . -G "Unix Makefiles" -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" + cmake -B . -G "Unix Makefiles" -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows-static cmake --build . - name: Create ZIP Archive shell: cmd