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

[qtbase] Fix x64-linux-dynamic build (#25672)

Browse Source 
Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com>
This commit is contained in:
Osyotr 2022-07-12 02:27:05 +03:00 committed by GitHub
parent 3c37f48862
commit d769781d11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/qtbase/portfile.cmake
View File

@ -342,7 +342,7 @@ string(REGEX REPLACE "set\\\(__qt_initial_c_compiler [^\\\n]+\\\n" "" toolchain_
string(REGEX REPLACE "set\\\(__qt_initial_cxx_compiler [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}")
file(WRITE "${qttoolchain}" "${toolchain_contents}")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS)
if(VCPKG_CROSSCOMPILING)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/qmake" "${CURRENT_PACKAGES_DIR}/debug/bin/qmake") # qmake has been moved so this is the qmake helper script
endif()

1
ports/qtbase/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "qtbase",
"version": "6.3.1",
"port-version": 1,
"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,

2
versions/baseline.json
View File

@ -5934,7 +5934,7 @@
},
"qtbase": {
"baseline": "6.3.1",
"port-version": 0
"port-version": 1
},
"qtcharts": {
"baseline": "6.3.1",

5
versions/q-/qtbase.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "53f9f138ffa51742c27c5e44606f86b6b70b2734",
"version": "6.3.1",
"port-version": 1
},
{
"git-tree": "436e3f3fbaac28eabd4199c4ac97407bb701e929",
"version": "6.3.1",