CI: modify ci

KangLin · Jul 12, 2023 · b23506b · b23506b
1 parent d0e2b3f
commit b23506b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -139,7 +139,10 @@ jobs:
               -DANDROID_PLATFORM=${{env.ANDROID_PLATFORM}} \
               -DANDROID_NATIVE_API_LEVEL=${{env.ANDROID_NATIVE_API_LEVEL}} \
               -DQt6LinguistTools_DIR=${Qt6_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
-              -DCMAKE_INSTALL_PREFIX=`pwd`/install
+              -DCMAKE_INSTALL_PREFIX=`pwd`/install \
+              -DVCPKG_VERBOSE=ON \
+              -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
+              -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake
           cmake --build . --config ${{matrix.BUILD_TYPE}}  --target all
           cmake --build . --config ${{matrix.BUILD_TYPE}}  --target install
           APK_FILE=`find . -name "android-*.apk"`

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -105,7 +105,10 @@ jobs:
               -DCMARK_STATIC=ON \
               -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
               -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/build/install \
-              -DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}}/lib/cmake 
+              -DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}}/lib/cmake \
+              -DVCPKG_VERBOSE=ON \
+              -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
+              -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake
           cmake --build . --config ${{ matrix.BUILD_TYPE }} --target install
           7z a Calendar_${{env.Calendar_VERSION}}_macos_qt${{matrix.qt_version}}.zip ./install/*
 

diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -124,7 +124,8 @@ jobs:
               -DCMARK_STATIC=ON ^
               -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} ^
               -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build/install ^
-              -DBUILD_QUIWidget=OFF ^
+              -DVCPKG_VERBOSE=ON ^
+              -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON ^
               -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake
           cmake --build . --config ${{ matrix.BUILD_TYPE }}
           cmake --build . --config ${{ matrix.BUILD_TYPE }} --target install

diff --git a/3th_libs/LunarCalendar b/3th_libs/LunarCalendar