fix paths

m-kuhn · May 11, 2024 · 60808bd · 60808bd
1 parent db64816
commit 60808bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/windows-qt6.yml b/.github/workflows/windows-qt6.yml
@@ -106,4 +106,4 @@ jobs:
         with:
           name: qgis-windows-qt6
           path: |
-            build/*-win64.zip
+            build/*-win64.zip
diff --git a/cmake/VcpkgInstallDeps.cmake b/cmake/VcpkgInstallDeps.cmake
@@ -22,8 +22,8 @@ endif()
 install(DIRECTORY "${PROJ_DATA_PATH}/" DESTINATION "${CMAKE_INSTALL_DATADIR}/proj")
 install(DIRECTORY "${VCPKG_BASE_DIR}/share/gdal/" DESTINATION "${CMAKE_INSTALL_DATADIR}/gdal")
 install(DIRECTORY "${VCPKG_BASE_DIR}/bin/Qca/" DESTINATION "bin/Qca") # QCA plugins
-install(DIRECTORY "${VCPKG_BASE_DIR}/plugins/" DESTINATION "bin/plugins") # qt plugins
-install(DIRECTORY "${VCPKG_BASE_DIR}/qml/" DESTINATION "bin/qml") # qt qml plugins
+install(DIRECTORY "${VCPKG_BASE_DIR}/Qt6/plugins/" DESTINATION "bin/plugins") # qt plugins
+install(DIRECTORY "${VCPKG_BASE_DIR}/Qt6/qml/" DESTINATION "bin/qml") # qt qml plugins
 install(DIRECTORY "${VCPKG_BASE_DIR}/tools/python3/"
         DESTINATION "bin"
         PATTERN "*.sip" EXCLUDE)