Try running vcpkg in CI

theCheeseboard · Dec 8, 2024 · a7038d3 · a7038d3
1 parent 1fbeba0
commit a7038d3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -21,7 +21,7 @@ jobs:
         uses: jurplel/install-qt-action@v3
         with:
           aqtversion: '>=3.1.18'
-          version: '6.8.0'
+          version: '6.8.1'
           arch: 'win64_msvc2022_64'
           target: 'desktop'
           cache: true
@@ -53,13 +53,20 @@ jobs:
         with:
           project: theCheeseboard/contemporary-qml
           commitish: main
+      - name: Install vcpkg dependencies
+        run: ${{ env.VCPKG_INSTALLATION_ROOT }}/vcpkg install
       - name: Install thebeat
         id: thebeat
         uses: theCheeseboard/actions/build-cmake-project@actions
         with:
           project: .
           commitish: .
-          extra-cmake-args: '-DTAGLIB_ROOT=${{ steps.taglib.outputs.install-directory }}'
+          extra-cmake-args: |
+              -DTAGLIB_ROOT=${{ steps.taglib.outputs.install-directory }}
+              -DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_INSTALLATION_ROOT }}scripts/buildsystems/vcpkg.cmake"
+              -DVCPKG_INSTALLED_DIR=${{ github.workspace }}/vcpkg_installed
+              -DVCPKG_HOST_TRIPLET=x64-windows
+              -DVCPKG_TARGET_TRIPLET=x64-windows-mixed-release
       - name: Deploy thebeat
         env:
           SOURCE_DIRECTORY: ${{ steps.thebeat.outputs.source-directory }}

diff --git a/vcpkg/overlay-ports/libcdio-paranoia/portfile.cmake b/vcpkg/overlay-ports/libcdio-paranoia/portfile.cmake
@@ -19,4 +19,4 @@ vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST ${SOURCE_PATH}/COPYING)
diff --git a/vcpkg/overlay-ports/libcdio/portfile.cmake b/vcpkg/overlay-ports/libcdio/portfile.cmake
@@ -19,7 +19,6 @@ vcpkg_configure_make(
     SOURCE_PATH ${SOURCE_PATH}
     AUTOCONFIG
     OPTIONS
-        ${OPTIONS}
         --without-cd-drive
         --without-cd-info
         --without-cdda-player
@@ -34,4 +33,4 @@ vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST ${SOURCE_PATH}/COPYING)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,4 @@ vcpkg_fixup_pkgconfig()

		file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

		file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
		vcpkg_install_copyright(FILE_LIST ${SOURCE_PATH}/COPYING)