From acdd1300d6aa0e8b16c3594a228c52a6124ea23e Mon Sep 17 00:00:00 2001 From: Michel Schmid Date: Fri, 16 Feb 2024 19:23:23 +0100 Subject: [PATCH] tmp --- .github/workflows/build.yaml | 5 +++-- vcpkg.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b4f29a9..8c7049d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -47,14 +47,14 @@ jobs: uses: lukka/run-vcpkg@v11 with: vcpkgGitCommitId: 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50 - vcpkgDirectory: c:/vcpkg # folder must reside in c:\ otherwise qt wont install due to long path errors + # vcpkgDirectory: c:/vcpkg # folder must reside in c:\ otherwise qt wont install due to long path errors - name: Run CMake and run vcpkg to build packages uses: lukka/run-cmake@v10 with: # this preset is needed to actually install the vcpkg dependencies configurePreset: "ninja-multi-vcpkg" - configPresetAdditionalArgs: "[-DVCPKG_TARGET_TRIPLET=x64-windows]" + configurePresetAdditionalArgs: "['-DVCPKG_TARGET_TRIPLET=x64-windows']" buildPreset: "ninja-multi-vcpkg" buildPresetAdditionalArgs: "['--config Release']" env: @@ -62,3 +62,4 @@ jobs: # for the hosting system will be automatically choosen (x64 is the default on all # platforms, e.g. `x64-osx`). VCPKG_DEFAULT_TRIPLET: "x64-windows" + # VCPKG_ROOT: "c:/vcpkg" diff --git a/vcpkg.json b/vcpkg.json index 89c2f3c..2d65acc 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -2,7 +2,7 @@ "name": "grsim", "version-string": "0.0.1", "dependencies": [ - "qt5-base", + "qt5", "ode", "protobuf" ]