Skip to content

Commit 812f7e9

Browse files
committed
CI: modify android.yml
1 parent 1ad0329 commit 812f7e9

1 file changed

Lines changed: 15 additions & 2 deletions

File tree

.github/workflows/android.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ jobs:
279279
-DCMAKE_VERBOSE_MAKEFILE=ON \
280280
-DCMAKE_AUTOGEN_VERBOSE=ON \
281281
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
282+
-DCMAKE_PREFIX_PATH=${Qt6_DIR} \
282283
-DQt6LinguistTools_DIR=${Qt6_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
283284
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
284285
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
@@ -304,7 +305,13 @@ jobs:
304305
${Qt6_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
305306
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
306307
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
307-
-DCMAKE_PREFIX_PATH=${Qt6_DIR}
308+
-DCMAKE_PREFIX_PATH=${Qt6_DIR} \
309+
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
310+
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
311+
-DVCPKG_VERBOSE=ON \
312+
-DVCPKG_TRACE_FIND_PACKAGE=ON \
313+
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
314+
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON
308315
cmake --build . --config ${{matrix.BUILD_TYPE}}
309316
cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
310317
fi
@@ -321,7 +328,13 @@ jobs:
321328
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
322329
-Dlxqt2-build-tools_DIR=${{env.INSTALL_DIR}}/share/cmake/lxqt2-build-tools \
323330
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
324-
-DCMAKE_PREFIX_PATH=${Qt6_DIR}
331+
-DCMAKE_PREFIX_PATH=${Qt6_DIR} \
332+
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
333+
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
334+
-DVCPKG_VERBOSE=ON \
335+
-DVCPKG_TRACE_FIND_PACKAGE=ON \
336+
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
337+
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON
325338
cmake --build . --config ${{matrix.BUILD_TYPE}}
326339
cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
327340
fi

0 commit comments

Comments
 (0)