[qtbase/qt5-base] Add more convenient msg about install the correct dependencies for Ubuntu (#30854)

* [qtbase/qt5-base] Add more convenient msg about install the correct dependencies for ubuntu

* Add https://doc.qt.io/qt-5/linux-requirements.html back, fix them -> they typo, and wrap.

---------

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
Cheney Wang 2023-04-15 05:13:05 +08:00 committed by GitHub
parent 806109919f
commit 02e902e380
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 11 deletions

View File

@ -1,14 +1,11 @@
vcpkg_buildpath_length_warning(37)
if (VCPKG_TARGET_IS_LINUX)
message(WARNING "qt5-base currently requires some packages from the system package manager, see https://doc.qt.io/qt-5/linux-requirements.html")
message(WARNING
[[
qt5-base for qt5-x11extras requires several libraries from the system package manager. Please refer to
https://github.com/microsoft/vcpkg/blob/master/scripts/azure-pipelines/linux/provision-image.sh
for a complete list of them.
]]
)
message(WARNING "qt5-base currently requires some packages from the system package manager. "
"They can be installed on Ubuntu systems via "
"sudo apt-get install '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev "
"libxi-dev libxkbcommon-dev libxkbcommon-x11-dev. For more information, see "
"https://doc.qt.io/qt-5/linux-requirements.html")
elseif(VCPKG_TARGET_IS_MINGW AND CMAKE_HOST_WIN32)
find_program(MINGW32_MAKE mingw32-make PATHS ENV PATH NO_DEFAULT_PATH REQUIRED)
endif()

View File

@ -1,6 +1,7 @@
{
"name": "qt5-base",
"version": "5.15.9",
"port-version": 1,
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -33,6 +33,13 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES)
message(FATAL_ERROR "${PORT} requires feature doubleconversion on windows!" )
endif()
if(VCPKG_TARGET_IS_LINUX)
message(WARNING "qtbase currently requires packages from the system package manager. "
"They can be installed on Ubuntu systems via sudo apt-get install "
"'^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev "
"libxkbcommon-x11-dev.")
endif()
# Features can be found via searching for qt_feature in all configure.cmake files in the source:
# The files also contain information about the Platform for which it is searched
# Always use FEATURE_<feature> in vcpkg_cmake_configure

View File

@ -1,7 +1,7 @@
{
"name": "qtbase",
"version": "6.4.3",
"port-version": 1,
"port-version": 2,
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -6426,7 +6426,7 @@
},
"qt5-base": {
"baseline": "5.15.9",
"port-version": 0
"port-version": 1
},
"qt5-canvas3d": {
"baseline": "0",
@ -6598,7 +6598,7 @@
},
"qtbase": {
"baseline": "6.4.3",
"port-version": 1
"port-version": 2
},
"qtcharts": {
"baseline": "6.4.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "11985a25ce0eb80b4a66246fc5962140f454225f",
"version": "5.15.9",
"port-version": 1
},
{
"git-tree": "0dbe8668bfb03c43ce4fec9edf98da248e581774",
"version": "5.15.9",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b694b6e51c89c8610540165e6e8b3a236acb4301",
"version": "6.4.3",
"port-version": 2
},
{
"git-tree": "425f6dcfce1eadab0723c4ec5e9085da0272ab6d",
"version": "6.4.3",