From d7694bc977bec8b4740cfd9d431f6b2b9df4f532 Mon Sep 17 00:00:00 2001 From: Rick Vogel Date: Mon, 31 Oct 2022 15:21:43 +0100 Subject: [PATCH] define CMAKE_PREFIX_PATH --- .github/workflows/cmake.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 948106c2..b4ebc21c 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -29,6 +29,7 @@ jobs: qtversion: "5.15.2", qtdirkey: "Qt5_DIR", qtdirvalue: "../Qt/5.15.2/msvc2019_64/lib/cmake/Qt5", + qtprefixdir: "../Qt/5.15.2/msvc2019_64", }, } - { @@ -46,6 +47,7 @@ jobs: qtversion: "6.2.4", qtdirkey: "Qt6_DIR", qtdirvalue: "../Qt/6.2.4/msvc2019_64/lib/cmake/Qt6", + qtprefixdir: "../Qt/6.2.4/msvc2019_64", }, } - { @@ -63,6 +65,7 @@ jobs: qtversion: "5.15.2", qtdirkey: "Qt5_DIR", qtdirvalue: "../Qt/5.15.2/msvc2019_64/lib/cmake/Qt5", + qtprefixdir: "../Qt/5.15.2/msvc2019_64", }, } - { @@ -80,6 +83,7 @@ jobs: qtversion: "6.2.4", qtdirkey: "Qt6_DIR", qtdirvalue: "../Qt/6.2.4/msvc2019_64/lib/cmake/Qt6", + qtprefixdir: "../Qt/6.2.4/msvc2019_64", }, } - { @@ -94,8 +98,9 @@ jobs: cmake: { qtversion: "5.15.2", - qtdirkey: "Qt5_DIR", + qtdirkey: "Qt5_DIR", qtdirvalue: "../Qt/5.15.2/gcc_64/lib/cmake/Qt5", + qtprefixdir: "../Qt/5.15.2/gcc_64", }, } - { @@ -112,6 +117,7 @@ jobs: qtversion: "6.2.4", qtdirkey: "Qt6_DIR", qtdirvalue: "../Qt/6.2.4/gcc_64/lib/cmake/Qt6", + qtprefixdir: "../Qt/6.2.4/gcc_64", }, } - { @@ -128,6 +134,7 @@ jobs: qtversion: "5.15.2", qtdirkey: "Qt5_DIR", qtdirvalue: "../Qt/5.15.2/gcc_64/lib/cmake/Qt5", + qtprefixdir: "../Qt/5.15.2/gcc_64", }, } - { @@ -144,6 +151,7 @@ jobs: qtversion: "6.2.4", qtdirkey: "Qt6_DIR", qtdirvalue: "../Qt/6.2.4/gcc_64/lib/cmake/Qt6", + qtprefixdir: "../Qt/6.2.4/gcc_64", }, } - { @@ -160,6 +168,7 @@ jobs: qtversion: "5.15.2", qtdirkey: "Qt5_DIR", qtdirvalue: "../Qt/5.15.2/clang_64/lib/cmake/Qt5", + qtprefixdir: "../Qt/5.15.2/clang_64", }, } - { @@ -176,6 +185,7 @@ jobs: qtversion: "6.2.4", qtdirkey: "Qt6_DIR", qtdirvalue: "../Qt/6.2.4/clang_64/lib/cmake/Qt6", + qtprefixdir: "../Qt/6.2.4/clang_64", }, } @@ -302,6 +312,7 @@ jobs: -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \ -G "${{ matrix.config.generators }}" \ -DCMAKE_INSTALL_PREFIX:PATH=instdir \ + -DCMAKE_PREFIX_PATH:PATH="${{ matrix.config.cmake.qtprefixdir }}" \ -D${{ matrix.config.cmake.qtdirkey }}:PATH="${{ matrix.config.cmake.qtdirvalue }}" - name: Build shell: bash