From bc09f94a7080281c1b68baa29fb25da037a9b18c Mon Sep 17 00:00:00 2001 From: Green Sky Date: Sun, 12 Jan 2025 16:32:08 +0100 Subject: [PATCH] pkgconf for windows ci/cd --- .github/workflows/cd.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 723e8e0..ab01483 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -73,7 +73,7 @@ jobs: submodules: recursive - name: Install Dependencies - run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static + run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static # setup vs env - uses: ilammy/msvc-dev-cmd@v1 @@ -81,7 +81,7 @@ jobs: arch: amd64 - name: Configure CMake - run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static + run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba80d27..a89f7c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: submodules: recursive - name: Install Dependencies - run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static + run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static # setup vs env - uses: ilammy/msvc-dev-cmd@v1 @@ -67,7 +67,7 @@ jobs: arch: amd64 - name: Configure CMake - run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static + run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4