mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 09:49:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[qt5-base] GLU is not required (#31148)

Browse Source
This commit is contained in:
Osyotr 2023-05-02 02:00:31 +03:00 committed by GitHub
parent 8b332e211c
commit cdc952976a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ports/qt5-base/portfile.cmake
View File

@ -1,11 +1,12 @@
vcpkg_buildpath_length_warning(37)
if (VCPKG_TARGET_IS_LINUX)
if(VCPKG_TARGET_IS_LINUX)
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 "
"sudo apt-get install '^libxcb.*-dev' libx11-xcb-dev libgl1-mesa-dev libxrender-dev "
"libxi-dev libxkbcommon-dev libxkbcommon-x11-dev. For more information, see "
"https://doc.qt.io/qt-5/linux-requirements.html")
"https://doc.qt.io/qt-5/linux.html and 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()
@ -264,9 +265,6 @@ if(VCPKG_TARGET_IS_WINDOWS)
endif()
elseif(VCPKG_TARGET_IS_LINUX)
list(APPEND CORE_OPTIONS -fontconfig -xcb-xlib -xcb -linuxfb)
if (NOT EXISTS "/usr/include/GL/glu.h")
message(FATAL_ERROR "qt5 requires libgl1-mesa-dev and libglu1-mesa-dev, please use your distribution's package manager to install them.\nExample: \"apt-get install libgl1-mesa-dev libglu1-mesa-dev\"")
endif()
list(APPEND RELEASE_OPTIONS
"SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread"
"HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_RELEASE}"

2
ports/qt5-base/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "qt5-base",
"version": "5.15.9",
"port-version": 1,
"port-version": 2,
"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,

2
versions/baseline.json
View File

@ -6466,7 +6466,7 @@
},
"qt5-base": {
"baseline": "5.15.9",
"port-version": 1
"port-version": 2
},
"qt5-canvas3d": {
"baseline": "0",

5
versions/q-/qt5-base.json
View File

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