diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci.baseline.txt | 22 | ||||
| -rw-r--r-- | scripts/test_ports/cmake/portfile.cmake | 18 | ||||
| -rw-r--r-- | scripts/test_ports/cmake/vcpkg.json | 6 |
3 files changed, 28 insertions, 18 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5822206e2..ec54e309f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1280,36 +1280,38 @@ python2:arm-uwp=fail python2:x64-linux=fail python2:x64-osx=fail python2:x64-uwp=fail +# Not yet ready for these platforms. +qbittorrent:x64-osx=fail +qbittorrent:x64-linux=fail qhull:x64-uwp=fail qhull:arm-uwp=fail qpid-proton:arm-uwp=fail qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail -qt5-activeqt:x64-linux=fail -qt5-activeqt:x64-osx=fail +# Skip ports not available in Qt 6.1.0 (for Qt 6.2) +qt6betablock:x86-windows=skip +qt6betablock:x64-windows=skip +qt6betablock:x64-windows-static=skip +qt6betablock:x64-windows-static-md=skip +qt6betablock:x64-linux=skip +qt6betablock:x64-osx=skip qt5-base:arm64-windows=fail # Skip deprecated Qt module -# (remnove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) +# (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) qt5-canvas3d:x64-linux=skip qt5-canvas3d:x64-osx=skip qt5-canvas3d:x64-windows=skip qt5-canvas3d:x64-windows-static=skip qt5-canvas3d:x64-windows-static-md=skip qt5-canvas3d:x86-windows=skip -qt5-macextras:x64-linux=fail -qt5-macextras:x64-windows=fail -qt5-macextras:x64-windows-static=fail -qt5-macextras:x64-windows-static-md=fail -qt5-macextras:x86-windows=fail # Missing system libraries qt5-wayland:x64-osx=fail +qtwayland:x64-osx=fail # Missing libraries qt5-wayland:x86-windows=fail qt5-wayland:x64-windows=fail qt5-wayland:x64-windows-static=fail qt5-wayland:x64-windows-static-md=fail -qt5-winextras:x64-linux=fail -qt5-winextras:x64-osx=fail # Missing prerequisites for CI success qt5-webengine:x64-linux=fail qt5-webengine:x64-osx=fail diff --git a/scripts/test_ports/cmake/portfile.cmake b/scripts/test_ports/cmake/portfile.cmake index 9df7b3f43..3a74a2e65 100644 --- a/scripts/test_ports/cmake/portfile.cmake +++ b/scripts/test_ports/cmake/portfile.cmake @@ -9,15 +9,27 @@ vcpkg_from_gitlab( 3b0de26910bceaf4bc6546255bada4c502cd0fd32f44bc28b067f347c09d028c175a3243551bbe4bb64bcf312df9ff827e8fdbcb0b34a12e1ce4a26ba0799ee2 HEAD_REF master ) - +set(OPTIONS) if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) - set(BUILD_CURSES_DIALOG ON) + list(APPEND OPTIONS -DBUILD_CursesDialog=ON) +else() + list(APPEND OPTIONS -DBUILD_CursesDialog=OFF) +endif() + +if(VCPKG_CROSSCOMPILING) + list(APPEND OPTIONS -DQt6CoreTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6CoreTools) + list(APPEND OPTIONS -DQt6WidgetsTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6WidgetsTools) + list(APPEND OPTIONS -DQt6GuiTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6GuiTools) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) # Remove if PR #16111 is merged + list(APPEND OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows) + endif() endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + ${OPTIONS} -DBUILD_TESTING=OFF #-DCMAKE_USE_SYSTEM_LIBRARIES=ON -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON @@ -30,8 +42,8 @@ vcpkg_configure_cmake( -DCMAKE_USE_SYSTEM_JSONCPP=ON -DCMAKE_USE_SYSTEM_LIBRHASH=OFF # not yet in VCPKG -DCMAKE_USE_SYSTEM_LIBUV=ON - -DBUILD_CursesDialog=${BUILD_CURSES_DIALOG} -DBUILD_QtDialog=ON # Just to test Qt with CMake + -DCMake_QT_MAJOR_VERSION:STRING=6 ) vcpkg_install_cmake(ADD_BIN_TO_PATH) diff --git a/scripts/test_ports/cmake/vcpkg.json b/scripts/test_ports/cmake/vcpkg.json index c2c4d9752..541ea1d77 100644 --- a/scripts/test_ports/cmake/vcpkg.json +++ b/scripts/test_ports/cmake/vcpkg.json @@ -16,11 +16,7 @@ "platform": "!(windows | uwp)" }, "nghttp2", - "qt5-base", - { - "name": "qt5-winextras", - "platform": "windows" - }, + "qtbase", "zlib", "zstd" ] |