mirror of https://github.com/microsoft/vcpkg.git
[Qt[latest]] Update to 5.14.2 (#10644)
* make qt5 all features and add the missing qt modules * fix control * qt5 webengine enviromnent setup * copy qtminimal plugin to tools * add opengles3 option for testing * [qt5-imageformats] freeglut is not a dependency on osx * [qt5-base] fontconfig can require iconv on linux and osx * include the jasper fix to get CI coverage? * trying to get ci coverage for qt on osx * Revert "trying to get ci coverage for qt on osx" This reverts commit8b9b188839. * apply the correct ci hack * fix wrapper to include macosx debug suffix * update baseline * first try to fix the Qt5 cmake configs at the root. * fix missing backslash * fix plugin patch * fix qt config patch * remove 90% of fixcmake.py * update baseline * experimental removal of fixcmake.py and dll copying into tools/qt5/bin * fix experimental dll copying. * fix static windows builds * fix static builds * fix plugin copy * add quotes around configuration to make it work * remove dll debug messages * note about the cmake fix * revert fontconfig changes on linux. Make qt.conf relative and not absolute * make qt.conf relative * trying to fix ogre osx ci regression * fix silly path error * Revert "trying to fix ogre osx ci regression" This reverts commit708d8250d6. * add ogre:x64-osx=fail to CI baseline * retry on osx * fix configure error. since in qt5-base everything is in the package directory and not in the installed * revert change to ci.baseline * update ci baseline * update Qt Control fields * update qt hashes to 5.12.7 * update baseline update missing hashes update empty include/packages add info for placeholder ports not yet correctly working (e.g. qt5-wayland) * fix linux qt targets not having debug properties. * remove most of the wrapper * actual forgot to commit the prl parser * fix the config a bit differently. have to check linux configs again * add xlib patch. * make qt-base fail to get logs on linux * Need logs from qt5-base * update versions I missed * ws change * lets see if this is enough to make qt5-x11extras happy * add upstream patch. * add newline to patch * ws change to trigger rebuild and maybe get logs on osx failure * need generated cmakescripts to check linkage. * rename cmake files to end on .log so that i can inspect them after CI failure * fix patch * make qt run * androidextras only supports android * qt5-doc will only be build on linux * ws ci trigger due to download failure * WS to retrigger CI due to download failure * add code for debug tools * lets see if we can do it with only the release tools * update baseline * fix create link error on linx * update baseline * revert changes which tried to use release tools only * fix dependencies * add debug qt.conf * add another copyright install * qtdoc does not have any include files * fix wrong copy pasta * update latest port hashes. * make the patches versions dependent * cleanup qt5 control a bit * update qt5-base control for ci run to use latest * fix patches for latest * forgot to commit the portfile changes * fix imageformat dependencies for latest qt * update last hash * fix translations dependencies * get cmake scripts from CI * new patch for creating correct configs * patch precompiled headers away from qt5-webengine * fix patch for 5.12.7. (Patch was for 5.14.1) * trigger CI rebuild * add simple gl path to fix the chormium build error * comment out debug message from prl parser * bump control * update webengine control * update CI to skip webengine. * update baseline * ws change to osg-qt * remove kd-soap from faillist * reset ci baseline to upstream/master * update baseline * fix osg-qt? * skip ms-angle on osx and linux since the normal angle port should be used! * update ci baseline * try adding fontconfig manually * update ci baseline to remove osg-qt for the time being * remove manual library. * remove wrapper and get plugin info also from linux and osx * allow build of complete qt * fix missing parameter in populate plugin. * need more info from CI * fix foreach CI loop * comment out CI code colllection to make a full qt5 ci run * fix qt5-imageformats regression on linux * update baseline * - add patch to find the debug library - manually fix EGL path in Qt5GuiConfigExtras.cmake * bump control * update hashes to 5.14.2 * comment out messages for debugging * bump version in control * fix create cmake patch * add qtmain path corrections for single configuration build. * fix escaping of . in regex * remove one to many \\ * remove latest as a default feature * reenable messages to debug osg-qt issue on osx. * small cmake options details. might need to patch cmakelists.txt if this is not working * remove unnecessary comment * make prl parser silent again. * remove canvas3d from the default features since it has been deprecated and will be removed in the future * remove ws change * remove newline and ws * trigger ci test * revert199a3ef92f* add messages to qt5-webengine and adjust baseline * add jpeg and zlib to JASPER_LIBS Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
This commit is contained in:
Alexander Neumann
GitHub
parent
ed9511fcf6
commit
bb7ccc4b90
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO openscenegraph/osgQt
|
||||
|
|
@ -14,9 +13,18 @@ if(VCPKG_TARGET_IS_OSX)
|
|||
string(APPEND VCPKG_C_FLAGS "") # both must be set
|
||||
endif()
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
||||
set(OPTIONS -DDYNAMIC_OPENSCENEGRAPH=ON)
|
||||
else()
|
||||
set(OPTIONS -DDYNAMIC_OPENSCENEGRAPH=OFF)
|
||||
endif()
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS ${OPTIONS}
|
||||
-DBUILD_OSG_EXAMPLES=OFF
|
||||
-DOSG_BUILD_APPLICATION_BUNDLES=OFF
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-3d
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering
|
||||
Build-Depends: qt5-base, qt5-declarative, qt5-imageformats, qt5-gamepad
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Source: qt5-activeqt
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 ActiveQt Module - ActiveX components
|
||||
Build-Depends: qt5-base
|
||||
Supports: windows
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
Source: qt5-androidextras
|
||||
Version: 5.12.7
|
||||
Description: Qt5 androidextras Module;
|
||||
Build-Depends: qt5-base
|
||||
Supports: android
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
|
||||
qt_submodule_installation()
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
Source: qt5-base
|
||||
Version: 5.12.5-13
|
||||
Homepage: https://www.qt.io/
|
||||
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
|
||||
Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)
|
||||
|
||||
Feature: latest
|
||||
Description: Build latest qt version (5.13.1) instead of LTS
|
||||
Source: qt5-base
|
||||
Version: 5.12.7
|
||||
Homepage: https://www.qt.io/
|
||||
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
|
||||
Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)
|
||||
|
||||
Feature: latest
|
||||
Description: Build latest qt version (5.14.2) instead of LTS
|
||||
|
|
|
|||
|
|
@ -77,8 +77,10 @@ function(configure_qt)
|
|||
-extprefix ${CURRENT_INSTALLED_DIR}
|
||||
${EXT_BIN_DIR}
|
||||
-hostprefix ${CURRENT_INSTALLED_DIR}/tools/qt5${_path_suffix_${_buildname}}
|
||||
#-hostprefix ${CURRENT_INSTALLED_DIR}/tools/qt5
|
||||
-hostlibdir ${CURRENT_INSTALLED_DIR}/tools/qt5${_path_suffix_${_buildname}}/lib # could probably be move to manual-link
|
||||
-hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5${_path_suffix_${_buildname}}/bin
|
||||
#-hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5/bin
|
||||
# Qt VS Plugin requires a /bin subfolder with the executables in the root dir. But to use the wizard a correctly setup lib folder is also required
|
||||
# So with the vcpkg layout there is no way to make it work unless all dll are are copied to tools/qt5/bin and all libs to tools/qt5/lib
|
||||
-archdatadir ${CURRENT_INSTALLED_DIR}/tools/qt5${_path_suffix_${_buildname}}
|
||||
|
|
|
|||
|
|
@ -99,4 +99,30 @@ function(qt_build_submodule SOURCE_PATH)
|
|||
endforeach()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
#This should be removed if somehow possible
|
||||
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/tools/qt5/bin")
|
||||
file(COPY "${CURRENT_PACKAGES_DIR}/debug/tools/qt5/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug")
|
||||
|
||||
set(CURRENT_INSTALLED_DIR_BACKUP "${CURRENT_INSTALLED_DIR}")
|
||||
set(CURRENT_INSTALLED_DIR "./../../../.." ) # Making the qt.conf relative and not absolute
|
||||
configure_file(${CURRENT_INSTALLED_DIR_BACKUP}/tools/qt5/qt_debug.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/qt.conf) # This makes the tools at least useable for release
|
||||
set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}")
|
||||
|
||||
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin")
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
file(GLOB_RECURSE DLL_DEPS_AVAIL "${CURRENT_INSTALLED_DIR}/tools/qt5/debug/bin/*.dll")
|
||||
string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/qt5/debug/bin/" "" DLL_DEPS_AVAIL "${DLL_DEPS_AVAIL}")
|
||||
file(GLOB_RECURSE DLL_DEPS_NEEDED "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/*.dll")
|
||||
string(REPLACE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/" "" DLL_DEPS_NEEDED "${DLL_DEPS_NEEDED}")
|
||||
if(DLL_DEPS_AVAIL AND DLL_DEPS_NEEDED)
|
||||
list(REMOVE_ITEM DLL_DEPS_NEEDED ${DLL_DEPS_AVAIL})
|
||||
endif()
|
||||
foreach(dll_dep ${DLL_DEPS_NEEDED})
|
||||
string(REGEX REPLACE "[^/]+$" "" dll_subpath "${dll_dep}")
|
||||
file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/${dll_dep}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt5/debug/bin/${dll_subpath}")
|
||||
endforeach()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
endfunction()
|
||||
|
|
@ -11,6 +11,8 @@ function(qt_install_copyright SOURCE_PATH)
|
|||
set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPL3")
|
||||
elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPL3-EXCEPT")
|
||||
set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPL3-EXCEPT")
|
||||
elseif(EXISTS "${SOURCE_PATH}/LICENSE.FDL")
|
||||
set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.FDL")
|
||||
endif()
|
||||
file(INSTALL ${LICENSE_PATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
endfunction()
|
||||
|
|
@ -1,45 +1,56 @@
|
|||
#Every update requires an update of these hashes and the version within the control file of each of the 32 ports.
|
||||
#So it is probably better to have a central location for these hashes and let the ports update via a script
|
||||
set(QT_MAJOR_MINOR_VER 5.12)
|
||||
set(QT_PATCH_VER 5)
|
||||
set(QT_PATCH_VER 7)
|
||||
set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes.
|
||||
|
||||
set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth
|
||||
purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets
|
||||
webview winextras xmlpatterns)
|
||||
|
||||
set(QT_HASH_qt5-base 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660)
|
||||
set(QT_HASH_qt5-3d 8cc23417b4a41bf9d19052e05c7e3be8773be062f1f5998a7784573ef9c35a04da50ce67a65b3709065bb3cf243aac8ede4bea60f0420a5400cbe6c9c7bdf05b)
|
||||
set(QT_HASH_qt5-activeqt 6233bb64ca45b6b0065afa50a3082c6df7e4e20d36040dfaf391e02876f50c41ec293db79a13636aeae9469deefad35ced42902548f9fcd78476359ad4450bee)
|
||||
set(QT_HASH_qt5-charts a3ba8c6a606430cd87f85661116dbb2692e0bb472f0a73310aca1950f4437563d04ee950437a48a399b1a4881dd264cd1e6fdd4f30b6c3110704ec48d1467da1)
|
||||
set(QT_HASH_qt5-connectivity 96cdb27aa0e439094e3f1de0c7a680973c3ce2c65bbbff38affe25a3708c9e4e3c1c6a403d698303f77a5f261b44ac657e01a769b62a1565e0a8c64c8ac80bd5)
|
||||
set(QT_HASH_qt5-datavis3d 7911d911678827ca4a704b824b8841c8e8508484fb83265d4d05e64787ac1184387b9ed0870090b3233c736f5e484adc7776ba12a1173da0fceeaac46845c6f4)
|
||||
set(QT_HASH_qt5-declarative 026c5024c06e44b6e91099d1ee912f38017f314ae0125227010d25d733447c692299cc7c47edc1a4bf39366a9c9c9fe77d3a249905f2ae982d0725317d824b9b)
|
||||
set(QT_HASH_qt5-gamepad bc4148bb75de53dd0885fc25ce7d679d7a5426a23ce9c93482fd11e8d6003cebe4c958fc07f17817a43f1d4449756deff24c0350fd33e100aeb2c302c650ae33)
|
||||
set(QT_HASH_qt5-graphicaleffects 489a308af5f56ff2b023375ddf705f8a1b15c0e1fb1ec3bc6e5f66a80b5863d63aa0e57a3aef025ab965694add8d71424123bca120ce8d8b8448e7218f7fc640)
|
||||
set(QT_HASH_qt5-imageformats 9fa76b7eec083596c45f68642b49dc88c2759a28cb9359935c3a64604082acea9adecee49bb0828cc587b86d469aec7169f8f72f83a15194c4fc10f0ca25fae0)
|
||||
set(QT_HASH_qt5-location fe82194e4e6bc2a2e6e3c55e3360afdfd56a6495a8d87bfbdceb29255430954d4c1adc62f1f82e63b23778f0bf03b0a50d6f5d2a963bd786f2cf2fbed7450ccc)
|
||||
set(QT_HASH_qt5-macextras 80779bf9c49ff89b866327a3358cede9308c41d6a49d8d6aa29661f4ad98d191c2f68d9af0d89be36fe54d094972f7a7689ecc26bc2bfcf53e9be1305e107178)
|
||||
set(QT_HASH_qt5-mqtt 3167de873dc3d42607440237c7b341c270079a1edd72588ebe95082ab209bbd24496d60d41c87ade166b595fda924a52cb2ff0efd05b48aa4c77c7b51b125f36)
|
||||
set(QT_HASH_qt5-multimedia a59983d887c8de462399fd53beb640c1b865c17f8b1a83635c2e1d27903861dd588eb64935d7c02d733c51c9a21174065e70a5fc1aa78600e5540c489b7695a3)
|
||||
set(QT_HASH_qt5-networkauth d7849518614a7bdb2ddbcf92b773f5e7c26f1af4ba07f0304b4634ed69bf3c17798509d28af2c49aba0cfad35a1cad5bda27acdbde3aa8d86038efeb9f5001e0)
|
||||
set(QT_HASH_qt5-purchasing b9f7e43cf4a8e23bc167d2473fa6f8af47455f066b584daf18d97d4a67dd766aaf17c7b897b2bae20cf636253174430be664815e1e86aeb07ed870bb2969ad0d)
|
||||
set(QT_HASH_qt5-quickcontrols 4539a6ce1ee20f71f6bf48271bc3fe1125bd21899cf36142d1c3d41a68ba56211f27d6e4403c69e86bd4698c7c7c79bc60f2a78ef1b19c5eab5b8690d1a01037)
|
||||
set(QT_HASH_qt5-quickcontrols2 afbd742783d83eabf182031e218c2f611709cd66f2b4886317bd356ffff2afabe820e1f552f478a0c3f74daf6fd1f5256900448f5445b84792d6a71b42ccd20a)
|
||||
set(QT_HASH_qt5-remoteobjects ed3314b1c66f9375bdc101029eaf730a630157ee41c094de2ff9cc5340c3c92a781dcb2b2cf0b8bbad8b19e566fb80f2d3b76e58624e990f90f23b8cdd21bd54)
|
||||
set(QT_HASH_qt5-script a422e47873ddf4c84adf00f51b721465acedfac535b0daeede63eac0d41c6f4f07d5a5f86513c86e981f3a0024020be03730670befab2a20cd4d6564c98d6c90)
|
||||
set(QT_HASH_qt5-scxml 23d340994af3e217ae58698dd0cd38f30d67d74a042d58cabbd0f38a6c13a8d64d6238cd6dee246ce0f99d5206bc210749941b88e5f745d3b92207eab06730b1)
|
||||
set(QT_HASH_qt5-sensors 81ac74e4c0a3d1942393c9267bbcc50af0e04a6f163d566010d6053dc4c69a67395c3f4b7564a50ec84ac88a715edd002920be4e145e6bd23d082a021dee1e5a)
|
||||
set(QT_HASH_qt5-serialport f3a5fb8c9a9513c16f52bd22b4fd4c6400819863237762f459d9f612ef2457447733cc8ed2bd645f182ab9eab6ddb5bcdbca2fbd67745def1a5fad1392087f4e)
|
||||
set(QT_HASH_qt5-speech 2a1a2c86ee3b5501623bb0c2c8e5b6f96b353707fe0eb804629187899eca5952c665ef037c4257f635edf34ddea03bc686f472a4a346d9f8e2adc7479f640482)
|
||||
set(QT_HASH_qt5-svg 3d7f89d106b36c8a0fd04c6e6f0ccde0c50ced7192980ea7d9330ba73d9307559e60ed2b10c28481a419d19aaae6609bde9e1dd74ccedf340dacf0194a60429d)
|
||||
set(QT_HASH_qt5-tools e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c)
|
||||
set(QT_HASH_qt5-virtualkeyboard e4581673451c40bf39b9793b0131bbad29e8a3f9db2d42adb23b48847bd674b6820717c051b76e506d4fd52e87c79b042533be85285a0cce9bcdc49cca964e66)
|
||||
set(QT_HASH_qt5-webchannel 8ea543f29e8f686961b033c1246714b1535d0be730026bef4b4ee172ce602c706d8a16b8391510a302df7be6545007a2f42311eb1aea4da326c3addde16ca2b2)
|
||||
set(QT_HASH_qt5-websockets 970ad232ad1258630404d5e7347721505a780497e1775f88591098f11bca48cbf62c4f02491b133d31e4304eb9e16f923292c5b778e22d530d7a5a4e95d422ba)
|
||||
set(QT_HASH_qt5-webview 310beedf88cefc05458e99838e7cb71971aa24ba6c460ff3da804c2ab7f56167ca1067ddca71ee29ced32ea974fe405261f24c8bbcac0c7b69063d7c4e38a4de)
|
||||
set(QT_HASH_qt5-winextras 053ca5f60c7946f6409ef34094b4a7d1431039407a5195e539e8edfda795da20fc695ceec58ae0df15e4dcc597047518d06a424d11fb4aaf6ae82f1d4badab33)
|
||||
set(QT_HASH_qt5-xmlpatterns 30b25e152970bfe51fcdeffa43d11dd51496e5ea6a5da644b13fa0ce4835302ebec651c1ecdcf9590c6689598cea9bd63748aab4ee0ec69f9155dc310a7c04c3)
|
||||
set(QT_HASH_qt5-base c8b90e50ec1824236541273b81024f1332c604748a038a48bc377b4c8e0886bfc27132990758abfd8ab9ea2aa5f1e42181ff369a0df4bc879dad0ef95868fde3)
|
||||
set(QT_HASH_qt5-3d 57c07756fb5838cf5201d4bf1ce5be843ba117356be768b5060750d3a8f117098ca97c8d10343d9554fa6d95ac00d7ee28ace6e6fb2770f18a1b575236b8afec)
|
||||
set(QT_HASH_qt5-activeqt 00daeba4ca2751d3c3f10bd798040316d817e1a9866a760a3acd6ac6055a0c87b888b87a77c112401fd9fed8a5a146ad0c274cd2bdc03c48088f667dfe182e8e)
|
||||
set(QT_HASH_qt5-charts 6e18b9e20616b43d95376ef229edd2eb2a2924bc05c44c9108b8e5fd94e20a80e34cadf03d36a1d45f62f2d7ba3a26b3e823def0af2c25c630830eb92bb22ceb)
|
||||
set(QT_HASH_qt5-connectivity 42d2831eafd136344839ec6dce1f408d6e8822dd55f593286a1aa74b61766aa5ecf35bcf918ace6fa551b68407b829c3602d67b32b8c5ce16d19325c33f61359)
|
||||
set(QT_HASH_qt5-datavis3d a5c60318a7115cd7368b8d2e7c1a83c207734ab63e9c6b7dfa451a3752d9e1f5ca6d718b65d1b11ecd59a6049adb2de8e5f78a305f3ee5d828d664bb11c5b0a6)
|
||||
set(QT_HASH_qt5-declarative 119155aed8ad6e74f7be2d0e44bf630fc493227c6ad0fdbd9a85bba8770939a0dd6c21a8583851e5adf243d51bdeb64bf79e1c4898176898e05a3897052315b6)
|
||||
set(QT_HASH_qt5-gamepad a7d3cc74e9a0b269acadfd5faa2a72ef3132762c51c31a346319899f165d67c9d92e0f1b80c4e748209c31502f30600bf0d012e8f478caf959f34ff33389ba05)
|
||||
set(QT_HASH_qt5-graphicaleffects fd6b59198e834a9e36e58445055610ac6dcfcb96d405d2dc294e0397460d6fdd119cfd4b0f29f43009154d623071dcb335223e33872fbfb5b6004abe9b6f5a55)
|
||||
set(QT_HASH_qt5-imageformats 1d721969bdb64b9674ecde992424e02997f051422d8d762d0e7930ae549792d1152751398ee2a906055da9d26df02d93f565d82a2e80a2659dcbd3ad347b4727)
|
||||
set(QT_HASH_qt5-location e82673e56f648a675df36c32a73217bf49b309a356c0de9e4defe14c3070d1d482d797fc11adca632edb59af9993f92e562dc5cb44dbcbad677ac3980c35676c)
|
||||
set(QT_HASH_qt5-macextras 3b5be4a929fef28061f195ad5aad2eafa9e5a3e03f405f8d3bf9eb5bfe66443d90a4d6ff6081a3cc1557017b896f70f617d828c874414572477d7950167291de )
|
||||
set(QT_HASH_qt5-mqtt 83c105ef7c4ccdb87cb2fa8d35da32ef6be32aeb57f6ec2b0176e9e565a7d8dd8989727e03b5c982073b63a752d39a865eeaa62a82d3cfaa22bfef60978cdef0 )
|
||||
set(QT_HASH_qt5-multimedia 25bce2851190cc4df47432c8ddee831fe9ea172f4a612a18bde6b1ce8c0f0fdc09ca0e484dad9e2d8659bfe0c84e2801a84c7f75d32976a5a9cdf1ba9e871f3c)
|
||||
set(QT_HASH_qt5-networkauth 484724ce60975c74e737c082f08dfc889e327618ca8efa83ed47b940ae515c836db9fd78ba67e930d27a1c1cd91cb14bdc055500c287c2e9853ddcfe1e1c43a6)
|
||||
set(QT_HASH_qt5-purchasing 08f2e97acab278e5fd53ef5ec9f3c9e15d3bf9d412f8d83ef4a0ab16619b4cc46940ee9ba5a770db98e79c4fbad24fca55d50de78ce3c30162ac6fb3ebf2d4c0)
|
||||
set(QT_HASH_qt5-quickcontrols 75f8600ec001131ac510057c6b16a5c34aae3a5ad6af5dc801ea3c63896e290c1bb5d71dd404613cf2958cdd965a924c1783029ec5d392f4db43aefa3ea0821c)
|
||||
set(QT_HASH_qt5-quickcontrols2 bd469316594e09da064fc6792c08ee87f345ab8c27bd33ae3fc38d184bebabf1ed824147eb960ac2700c67a683097c7615aebb0f717dc1a5ff1b330f27554ae9)
|
||||
set(QT_HASH_qt5-remoteobjects 7d0591e8b0232b65ce76fba18098aeee23390403430dae411f12e3bad4e3721c5160d6d46ed5fefcc38e01dcd593231f7a7f6eaf421ed91c6939af25d96bd9fc)
|
||||
set(QT_HASH_qt5-script 49a1b0563734908be0f3b99f0295f1f869f831d8e2b6ae77bd70c2a2f1fbc6bea8a8bda0092a1519d03f2969cfe38fede64530d9221734d907efd3137b9769be)
|
||||
set(QT_HASH_qt5-scxml 3c044127bb3f41945f959386c664d66035606dddac843fe029aeb52f0807f23e5ff2adced21e94533312d0030149866a80d49e0b3aa9222c6e6b99636d26dbd6)
|
||||
set(QT_HASH_qt5-sensors baa576792347bd0a95178a7e0b5ad47bcd4828d64b3801bfb1394647d95f8255b8800e52d9be0bde50b2fc9f0633d21ada940d4b7ff17c8cce72499b7b4a06ee)
|
||||
set(QT_HASH_qt5-serialport 59d14147bfb9e4885e9c88f70b261c021d4947cc04ce9982e821ae8b307d6323d797e6788764c206bef7b3013c6b9bed9288573c2ede33d4321c9f5a6907d1f5)
|
||||
set(QT_HASH_qt5-speech e3bc06f7952eee5c34f33c1a4404ccd12dd8886ef8d8af527dba41b58a27c5c667fea4bdaed7bfcfdcc9a2ca0f4a19f35c2c92995565a696828b5b4a41e31b3e)
|
||||
set(QT_HASH_qt5-svg 13e6053c99cc0f5b31bc48df0a8b93cfa26e49f3aa2732850747c7a8b3e78ff0a1c620e2a8729d291b5a6cf935d9a481f361ec9f6a78ae090ca997b344786f47)
|
||||
set(QT_HASH_qt5-tools d1e0b55e4eb5c22c9a912cf28a62f30e02d020a22085f5556e0ef9034aca849423cb2d6c9d27ffb3a6ffefe4a2e522b84ec1dd5ce700360d746c22be0c59c94b)
|
||||
set(QT_HASH_qt5-virtualkeyboard c8ebd905d15d23ea72df5857c25438b25a50e49f332bcf79cc3c81a9951589a56d11c3aaf7986387065f5020ad770efe93ca1e2a14fdfc6f1333b8e6439dd66e)
|
||||
set(QT_HASH_qt5-webchannel a5587abd6daf60f985cfa29c68449347bd22a8f63c6027400b02378b9c85cfbe1a45e8a844609b99b8646bcf980b0dd262b191226a0c8fd931b3e96696fe6469)
|
||||
set(QT_HASH_qt5-websockets 96762336abdb460a3279a6f47456e0b5690572f203a14fa2f0bf9e71a5cffbf6f512682e2c681ee3d3c2a87eb56ff5ac938f5ac828558b0e2745335f08201349)
|
||||
set(QT_HASH_qt5-webview 73e79c5f4d7b67b9cd2513abd709deccedcad3e5ab50755ba70f7e8123031acab6e38299eed7c03ccd3478f19d58cdc75726863f280a44b1c852aaa4d816f9a4)
|
||||
set(QT_HASH_qt5-winextras 450959c57e0cbcd35738232c4ba3ecaae1bec4c10fbca6d8ce31cf9029440835ddfea6811be7d9274a784b58c2a54c7bd721859e9b8439e2583bb15cfb9fda8e)
|
||||
set(QT_HASH_qt5-xmlpatterns f228c9c20b5aa00fc4f0e6918a53b780f10d58288c2af2b0edb8e279f1d21dd7a22afb0a08115cd0e3cab7adec1b4d2ee44cd1aff9298fb62b60a77d8d147ea9)
|
||||
##TODO
|
||||
set(QT_HASH_qt5-doc 0b3b2aa09429b7a20dd9704de5dc51392937e57949873088e33d54e41e05bebb17f95a57bb852bc510977eff0deba6453c115b7fb5e7021f4e182aa0c15474c0)
|
||||
set(QT_HASH_qt5-x11extras 1cf6b82fd884c88c941fc5d1a1bcc1e3da50fd1252c83c23c72411cbc7a9d81ff5b363175908b30927718706bc40a03b0cc9e64a96e91544e0a40af2c4144afd)
|
||||
set(QT_HASH_qt5-androidextras d2bdef84b0749d921fa2f71aef15b91ccafe40f6edfe9d47b7999072b3b8c5e7a143c91a6e96c14933c13b91ebbc657c287716db0efcb1da2b7ccb2ed239384d)
|
||||
set(QT_HASH_qt5-canvas3d 7f8374a98b4cd9e463ccfa29697f3b77c9b505953730c668ee4cb1cfc45d26a7c5c7a102a2779f70174a13333a91f5a3f6df096bf55ceb17258548ec86048794)
|
||||
set(QT_HASH_qt5-translations 6a4af59d916f060d726acfaf12e23c09adc73243f1f38bd3cb76a7d688dcb78b69ced6606dce2615a1ebdec09d210547d51975d0678d092cb61153551b1f6fff)
|
||||
set(QT_HASH_qt5-serialbus 66230ca95cb86bd3408dfa79236e37c350f4df8be8886d8f6206f0822068a05a24bfd3e29e5a5cc3c3cdd9f437d4609e5ee2c3fc7c4813117a1bb349a873dfb0)
|
||||
set(QT_HASH_qt5-webengine ff9e07abf5b708ef2320cccc53e032a3e0042926c71e5a76c880d4f97fb7f2c4ae4db2587c7998bae8690cd6f48a2dc4df1c2f5122121def99bef5ee7f7e70f2)
|
||||
set(QT_HASH_qt5-webglplugin 3a06e66734b2937ca84919fd93ec35c7768b11d8fa7916a48d9be19cec091f2acd6966bd495bde141b17582ae36c8a32718b13946977331b18e403eadfb02c53)
|
||||
set(QT_HASH_qt5-wayland 28d3d4b5df0c35bea5a9c9ffd032b01fe6c51a4c32d6ecc823d5103871f282ced9f7670901b6b74c0c042e7f816df5107d362d154ba109cfe8e3ba61b63778d5)
|
||||
|
||||
|
||||
if(QT_UPDATE_VERSION)
|
||||
message(STATUS "Running Qt in automatic version port update mode!")
|
||||
|
|
|
|||
|
|
@ -1,45 +1,55 @@
|
|||
#Every update requires an update of these hashes and the version within the control file of each of the 32 ports.
|
||||
#So it is probably better to have a central location for these hashes and let the ports update via a script
|
||||
set(QT_MAJOR_MINOR_VER 5.13)
|
||||
set(QT_PATCH_VER 1)
|
||||
set(QT_MAJOR_MINOR_VER 5.14)
|
||||
set(QT_PATCH_VER 2)
|
||||
set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes.
|
||||
|
||||
set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth
|
||||
purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets
|
||||
webview winextras xmlpatterns)
|
||||
|
||||
set(QT_HASH_qt5-base 86ab39eabb8867c4b038614341b7e49136f4ef898f06d4f1c899ddd2c2c271aa630bf63ad6abcf5c1f01659e6e5005f5da7dd83bb09a1484e15eb47e5274b9b3)
|
||||
set(QT_HASH_qt5-3d dc305162ff87a71736b98aeb710b338ad1c6084819a79073f92b086ecc641caa7798d1c2bea20dd9eb91a9caf853177f01404d19407f8d10cb2bb8198d75cb84)
|
||||
set(QT_HASH_qt5-activeqt cc0f9e92957142bbf44734560271e64cc8c3c5c337a8e180e68fd02a8cb7db8d6f8b86431e7c8abf62405a3fc8cef9922b111031310472495d7a75faa320940c)
|
||||
set(QT_HASH_qt5-charts c511d5b48f53312f0e7380d2d04019a5e500736a47bf4625f668042152026c1d5dc3299dd82243054119697063daa445329c78793e2107b01e84824968258d34)
|
||||
set(QT_HASH_qt5-connectivity de66b7d828f1259f59dac693ffd4bff15313e33b591ab748ca63a6470f1b3975bd30f48f75833400554cdbd8bb2f2a844b980b3db4242f08f43b82a2eb08c763)
|
||||
set(QT_HASH_qt5-datavis3d f7ee9973dd7773f52726307de057cfd1a15227b390050bf8eca5294e151726a91152c89c36f7c38039b53564fec191ac3ea630231cd8391ca98ce99621b5ad3d)
|
||||
set(QT_HASH_qt5-declarative 08cae55ffc51211cdaff0e4092284aa1d8305a08757ce214a54a362df66577ea6efdcf0b3aaae40f70862138369f8ec6b2eabfc55f99d67b5b3538f4e0e1eb21)
|
||||
set(QT_HASH_qt5-gamepad 0e4e7c307157a09ddb735656306ade50423bbafad03d2cbf322c007d4017a8cb5d2389429f2b487c6e99918c688fd85d732a326be0034c2938ece73ff5015428)
|
||||
set(QT_HASH_qt5-graphicaleffects b929ebd56821b2350472a37bc08c84e62c2010b740b3e9b00a8883e131cd585122dc50bfe5815c714c2eab1b4d8bbc458f6659bf02929a42de458f0a3b72f4fe)
|
||||
set(QT_HASH_qt5-imageformats 8a7ac126e7f88525ce490a13656608cee53db232f4af8a90783a2a2e8540fc0bfeed641d33cf41d3643e46439850f95da701b0d5215872e0882c38209da10144)
|
||||
set(QT_HASH_qt5-location 661ceff9ebb757e58e9430e0af86e782445029d42da61769264d5706c6633e42bf064c0afdb657e01dd2e3d9edd73e02dbadac2e65820038bbbcc3990a8e35aa)
|
||||
set(QT_HASH_qt5-macextras d27ab2b44cfcb1a4d02cd6d2403710546c8cc1bae834418975f7588bf647c822519c4701b4feaa5bca98e5ad089eb2dd9f328956339699274126422324e042fc)
|
||||
set(QT_HASH_qt5-mqtt 8aef8c8e6b7ef6acba864583396b680321c26b1f4910925e182592482d9363127c0767663cfd815262bdb4c32795c7b3e706c8543c7838e6907abca6d76eb9fd)
|
||||
set(QT_HASH_qt5-multimedia 4599da3fc627923ce1fae3739124cb609591097870ee873e386429b81ac6a3f5a6e3a8d1316a84fcef8a25de4b7301b1358d2f5da9d87b0c2e18ac1f34184d30)
|
||||
set(QT_HASH_qt5-networkauth 8a949006a7d2adc1bd7a55d80f93a622b0cc8e4ef644884b430c7ca4b82a2fc8b34b5e28492c175fe1b13da615a0ce66e6d80f58de4290d8515897bc521e80fc)
|
||||
set(QT_HASH_qt5-purchasing bdbe386562bd3203c83f61385fb23f4493c8e9f68cd05d64929598192ac80788a214e6a4bb96ea3f19f061b6a689237acf6752bc1012e4263127f1801cb3eef3)
|
||||
set(QT_HASH_qt5-quickcontrols f1204d709495197d6f664b7c7cb522be67a891985e4380b009bbd5e0b9854a603aa69f9b84c2189c6f35988ec3ffd7a6032c3ee097c449b40646ec66698b4689)
|
||||
set(QT_HASH_qt5-quickcontrols2 5325d06a906934d00c6a7eb4e82d9399bc9764366a1374dd2c3c83828e9152d5d646b746437a6128e306157e3a457341747773bf3aa54809346e598687d2aacd)
|
||||
set(QT_HASH_qt5-remoteobjects 087fd4f9f2f1e11796cce6d09f9adccd620ae664505c0475dab01c67b4afb699d93f788abf2e993961338424f0c9a87784148120221cbbf38febf5ec87012a1d)
|
||||
set(QT_HASH_qt5-script 31b2088432ae70c7d19be61cfcd5dd5bace7fc33f6882a7d489982c392ab39bdc2bca612e8403c6d30ca7cb41622a93514ad87066998378cdda8bc2ba3a42536)
|
||||
set(QT_HASH_qt5-scxml 8447f624578a92eee89c9f70cc4a44943cf9d015c06b20b83a90a6344a4ca7fa88e21121b9a98237140b1b59ab74be806ce6319c7b8b54c0aa2d3945af802e35)
|
||||
set(QT_HASH_qt5-sensors 7a28b57ebadae6f2fc94778f7bf5321464f182ec8c32437c3803ddbbf2dd3ac24e90a6dbefc5634be53e4fb64c82aa7bbb67fa302d58a538493a14a78cf8c798)
|
||||
set(QT_HASH_qt5-serialport 2465c4e723966d8c365230667b8f441a85e2a46b76e7070fe4b024015add376631c9016efe177364735ba41f34f21eeff6726a6511cee5b1d82b267ee6a58900)
|
||||
set(QT_HASH_qt5-speech 662fa345c1207143a0bf641455ed4109eb028bd376b9a1bec757747912da169dde84f26f1e47562ee8973d847cac8f258cf771b428af486e19edb5bd3ef7dcc0)
|
||||
set(QT_HASH_qt5-svg 76cfb880491bfa8295e5f7abfe842479516d355903ba620ff9bb42dd98ecafa3ef234f52ddd311ea9591b8e500e181c4849c6a0814fc0a1943c18d4697cd1f09)
|
||||
set(QT_HASH_qt5-tools b3bd614ed21a1b37829082f2ec89b086b4c8e7cc91be5ba7bef16dc52619e3357d2c9165c3a1eedbd1f1913d215cda3f9a59fc26d45ee0267bc1e3d7205d98b8)
|
||||
set(QT_HASH_qt5-virtualkeyboard 93840660675717bcce9237df5b6222306ad4b260a83bdae45110e3770acddcbf702e10d505ca0b2c71c24fb6c1742640c8bd56015331b219e8af9e7b9c793d24)
|
||||
set(QT_HASH_qt5-webchannel 4c0509bf80070ce09c0317e4e4faaa47cc87218e2e78036a3424a6e22c0b4a6175fc86f46103e90b876c73e5a2f7492a9eaaf8777885351fae0b036cc7fb629c)
|
||||
set(QT_HASH_qt5-websockets a951f355c3ce8f56fc5c4252e050ef008f4b3f9825a194a3e2e61a5e8ea9a3b89c6d9965acf9360be4655142b2057b4e7fb7a5b41412c3e14bef7846307670fb)
|
||||
set(QT_HASH_qt5-webview 4933a9a637eb4ca3790310f2921dcbaa44dd7363eb4226f522c6d38a8ada5dfdaf87a8b33390740524ff05056397c530426e3969f798a7c75f2f663c099192b8)
|
||||
set(QT_HASH_qt5-winextras 279514fc482a6e64a28970af2c69f9bd3db1e4e1ec9bf92be7d6ec47bdbea272149a4353ba0807da03ed8d0ee916f1d7f6efdc86bdb9173227055e0a44ac0155)
|
||||
set(QT_HASH_qt5-xmlpatterns 6b426e5af2f1f71b77c5cb2bba79a9dc8223c7d57192be445df0d2fe9066f07632ad5ee799b3a782bc582446057197b55fa0260d1ea525db8b3a9a3912081169)
|
||||
set(QT_HASH_qt5-base 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9)
|
||||
set(QT_HASH_qt5-3d 43053d001d59094bfac19c5bf3ad17df277c64d0c214b72d4cf02231396d9109a231da8d9d72ebe79822bc09ee24fa2387b4b120dbad43d69a49e3d66ee21da8)
|
||||
set(QT_HASH_qt5-activeqt 730a9086d09659e869045f2bc2a5eb43f99447e1bc176159bbc59175562ef6a562bd7a24f9923f4ceac12fdd902104fd7dbc418d8acda9b127c3e3f2d871a8f3)
|
||||
set(QT_HASH_qt5-charts 2776db3dfe6f6f1047bd19d8d936d3f72de46c0807bbf02ba874053113d76df4cf80497d5ed2cee192ad94abb8e12b4fbce8359a63d8beb1190d491fc2da35bc)
|
||||
set(QT_HASH_qt5-connectivity 948050b915f6f2e1fffcb2c8b55d9061f25a82314d02e7a39faa9b88e065bb924ce5f8a7c26ed1f07b29b986d47acd5678f57bb96668d1c1ecd93ad3a7e40c7a)
|
||||
set(QT_HASH_qt5-datavis3d 25d207e045e58f9edc3a661b641225f6a11eb45f723847281007fa53b753430dc5792e31bdd142c95e886bfda5f6d29826cd151cb23a1e1a81cc0b91d5f7a2f6)
|
||||
set(QT_HASH_qt5-declarative 48d3a547237514a8bdc2a4c0b3f97732abceacece0e0899d2f33787293eb99f54c28efce35a34b8c46dcd4d78ebbc88bfc820bc68496076eacace40aaceee004)
|
||||
set(QT_HASH_qt5-gamepad 23971fae9b1626afc005dccae3bb715f719695bf5e24a1711b3e7049ce49ef5c72097e1eb702464ab7663d41750bf4103e4ed78ee7954269921e3064b79f4c05)
|
||||
set(QT_HASH_qt5-graphicaleffects fa6ed3eff243675f9d0bfa71b2886804e4902cf9d7d91d5dec0f8e4f060ee7c347ba7775a89e3f8effd0ffed8314f916b55f09056902abc892ee27e79ce2925c)
|
||||
set(QT_HASH_qt5-imageformats e835489bdd1cf19aaa1c04e6ae1c480d4077cf24eee1d46b2f4deb03c093f64df6beaf83adb69b7edcba67c952a60deb89a26923addf2b4254aff18bc2ebf6a6)
|
||||
set(QT_HASH_qt5-location ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c)
|
||||
set(QT_HASH_qt5-macextras 99c8dc6a5cb6f62691d645a889d81438203f50eea19c25bfb0e3d784816712cd8ec01ed42fbc0db4307cf81d00b4c00a20b026683bbeef758a4f1888bc1e2094)
|
||||
set(QT_HASH_qt5-mqtt 8040b23c1078c53cc69f1a0e57e363bbc277c970f007058d168152cd0246062ef877d65928a4d6754f94c6aec696995fc88d166a84ba1678d999541b9a091c0d)
|
||||
set(QT_HASH_qt5-multimedia 5ebee0f96334d58b74ae344875aa93d32bfdd7c906856f84152e9ae0a3ebb12f627a0d3ab4552031b70c20ad59db1674b1a261ed0828e1efcc6ab48ba3718559)
|
||||
set(QT_HASH_qt5-networkauth 9001755ae289213f7d2c994bedbbcc1ca641b3c80fc5279f6829ed48c31eed8cdbd87a0ed0ce451bc9611318ef09ef7c40b795d2c45fface2bd357ee579b15ad)
|
||||
set(QT_HASH_qt5-purchasing 5576a5fbef50a25b2c3ebfbb674b630fad2f9b2c3e8737fe0db0b9374c8f07d47dc6212024af1fc6ce585787087a0da1a193cc964290370dcc0ec200c3ed5ccb)
|
||||
set(QT_HASH_qt5-quickcontrols e5076d838e54e8fcc62ffd76d66ab322f1927f6489c51dd0fa6e39de1e003c1994d24730da79c8d9d2747839faaa7b1b78f14b58f05447db440a477094be40e4)
|
||||
set(QT_HASH_qt5-quickcontrols2 de8b669417c2d039c0f49e805be72e757877991bc3c7feb13417202a4964cb6391924837751c520ed6234930e90dfe00417ca1c369418b2cdf4f09da679ba722)
|
||||
set(QT_HASH_qt5-remoteobjects 0e9fe5d6bfa8ef5ecc8700c7b757d98ad6f6711c8b10667aedaa9dcb32ae201a12bb37fb2d7a827e1bec399c2a75e8cf40226ddd6810feb9c44e287974b5345e)
|
||||
set(QT_HASH_qt5-script 2eef6c4d23fccd67abc3647852ca92edd951b4ece8047f28571689a143421c5a1403ef0fcc96615e4ed708df64f7eede643d872fac850554031a17e2d907f398)
|
||||
set(QT_HASH_qt5-scxml 2e1cbea7c32d93675b4a67287dd17c9ed120a6655f8f9a30edfe12a16f67b3c5ad6d0fd04c0102297693bf87e225d81e963534958c8e73622c605388c9fc8425)
|
||||
set(QT_HASH_qt5-sensors 43872a51163317c2fb642f59a9e41ede77cb86d7148436d9e673ac94543fb8acffe4e040824dd88a9029943418a3371c77815b82a0a566426857d18fbc23e341)
|
||||
set(QT_HASH_qt5-serialport 4a4fb81bcccaddc5902223940031a9002395cbc5e99c78c1ac5df04031b6a0551bb340757f84bad82ca7ef551358c1eba3a035b0b8f4221f7db0ab738ac65b06)
|
||||
set(QT_HASH_qt5-speech d3870cc66cba4f5dd2c0a2a4845defe4299de2d7affe12ccdadc4948116317590b580592d575cc5e8eb190043a92f38416e030f47cfb87f5cf3419a31152e00f)
|
||||
set(QT_HASH_qt5-svg b4cf8a7081e01caea3c71826d32ebb9da6a71bd4eab3cf353e87080009065aff2c533300c0c08a005ff8f441d2da641a097319114a5c11b618398fac41f574a7)
|
||||
set(QT_HASH_qt5-tools e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e)
|
||||
set(QT_HASH_qt5-virtualkeyboard 752634de8796a1809818176db47021aa24de842cf6334d689a91d3b011105a5e2b8113615a8f50f6974bf8fa989026b434121b42278de1ef905075ba3ee72c47)
|
||||
set(QT_HASH_qt5-webchannel 57080c8cf7fb5c91fa6b325566d3fb2dc3c1d3bcd8128d2a40ea92f8bae7ca0f0fb4bac1d68452998a5dc06781155058d149df069fed5ff16b6d8ad43a72e002)
|
||||
set(QT_HASH_qt5-websockets 091e17459a8a255fccece092399ac32994307aa53e6e72e736e6ff9f1bb745c49bfcb9a747e1e21acaa0ed95754f7f450ba2f73a3bbafad54e21bf600f7da92f)
|
||||
set(QT_HASH_qt5-webview 1a70be0c64f72b7e3b10c8e3ca58d4a04bef14496c8e4852c5cafbd13d653e2f682a58f7dcd576fce79ed082c01a5f8ffc6533836f495f6e5d4b6ddf2be8e3ca)
|
||||
set(QT_HASH_qt5-winextras 2cd46242845ceb9d41d4d13cdda7697d9caa4cc3ee860ae9f4813192381fbaf3aa3124bf8998db28470479b8ebc755fe86607681696480300c65a7d9ed9073ef)
|
||||
set(QT_HASH_qt5-xmlpatterns 27f674c4811b010ec461c54ee258b1d6b58dcb5c11795621b7bbad9fa2c19c1b6b62286cbe8895151261129c7d6d91007c3a8be6cf64af1f4cb32e2e9976ac23)
|
||||
##TODO
|
||||
set(QT_HASH_qt5-doc 38277f3ec84754e564aac4fb3b495953d1a4ab823d7a4733633e14947e41af9d7b79af0d2812b9457fb3824c17a83c14df8d2b80420c6743d1806aa521e04cf4)
|
||||
set(QT_HASH_qt5-x11extras cf30e66fda18b9bfd266b41f15713f7ca7390bc533fb8093096853f1554c2a91eb065dc17acb5b355b8fad08df3c695289d8c8081d568061c99659ec35d79b14)
|
||||
set(QT_HASH_qt5-androidextras 7355e8e049c739597b820c3dd96cdd48be7bed0becb171e1255c7caffd3a67aac349064da644ff3f3b11ebed31c26588d5db11fa5ffc743d7d010d1355eed26f)
|
||||
set(QT_HASH_qt5-canvas3d 0) # removed in latest
|
||||
set(QT_HASH_qt5-translations 38cedf19a1d7b920b7dcfcc014d3986c4067dafd7192efe43c3b8f282e0637391f9ec0b8cc7f5506cc76629d005298becba1421506b48c6baf3366ec2f378544)
|
||||
set(QT_HASH_qt5-serialbus c98c7d30dc7f44837a601088b2797bc85d8b659dcdba5f22c229edad0fcee57e38c5b5d55ed223f22c9ce4e14b72ea6e59b920d4f4b366d0381b208e3e9cff40)
|
||||
set(QT_HASH_qt5-webengine bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf)
|
||||
set(QT_HASH_qt5-webglplugin 02b059301527a3d943f842f3d076daba36470bee65c5888d1f896986f75556abb577bcfbf8337e4cf4fa1c6eb43e352430b1ea6ee1e02be826cd02b108915dc9)
|
||||
set(QT_HASH_qt5-wayland 0f396cabace17f099c2f2c0be54317006dc00c5f4be08cd79a4fa4fdc94362f63cc6ce9decc7feb63f566dd2ea52d562257e4bb23332557054418fc16dc7e899)
|
||||
|
||||
if(QT_UPDATE_VERSION)
|
||||
message(STATUS "Running Qt in automatic version port update mode!")
|
||||
|
|
|
|||
|
|
@ -29,7 +29,18 @@ index c72989288..a88234dca 100644
|
|||
!!ELSE
|
||||
set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
!!ENDIF
|
||||
@@ -270,9 +278,8 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
@@ -265,14 +265,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
!!IF !isEmpty(CMAKE_RELEASE_TYPE)
|
||||
!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
|
||||
_populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
|
||||
+ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\")
|
||||
+ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) # X64/X86-WINDOWS-STATIC!
|
||||
+ endif()
|
||||
!!ELSE
|
||||
_populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
|
||||
+ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\")
|
||||
+ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ## OSX! LINUX! X64/X86-WINDOWS!
|
||||
+ endif()
|
||||
!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
|
||||
|
||||
!!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
|
||||
|
|
@ -76,3 +87,14 @@ index c72989288..a88234dca 100644
|
|||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
|
||||
!!ENDIF
|
||||
@@ -482,6 +482,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
\"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
|
||||
!!ENDIF
|
||||
_populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
|
||||
+ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\")
|
||||
+ _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ### Never? Debug Config?
|
||||
+ endif()
|
||||
!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
|
||||
endif()
|
||||
!!ENDIF // CMAKE_RELEASE_TYPE
|
||||
|
||||
|
|
@ -0,0 +1,194 @@
|
|||
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
index c72989288..a88234dca 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -53,8 +53,12 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
|
||||
set(_lib_deps)
|
||||
set(_link_flags)
|
||||
|
||||
-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
- set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
|
||||
+!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
+ if(\"${Configuration}\" STREQUAL \"DEBUG\")
|
||||
+ set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}\")
|
||||
+ else()
|
||||
+ set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
|
||||
+ endif()
|
||||
!!ELSE
|
||||
set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\")
|
||||
!!ENDIF
|
||||
@@ -125,6 +129,8 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
|
||||
elseif(EXISTS \"${_flag}\")
|
||||
# The flag is an absolute path to an existing library
|
||||
list(APPEND _lib_deps \"${_flag}\")
|
||||
+ elseif(_flag MATCHES \"\\\\.lib$\") #Library name only. No -l. Probably missing some cases
|
||||
+ list(APPEND _lib_deps \"${_flag}\")
|
||||
elseif(_flag MATCHES \"^-L(.*)$\")
|
||||
# Handle -Lfoo flags by putting their paths in the search path used by find_library above
|
||||
list(APPEND _search_paths \"${CMAKE_MATCH_1}\")
|
||||
@@ -147,7 +153,11 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
|
||||
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
|
||||
|
||||
!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
||||
+ if(\"${Configuration}\" STREQUAL \"DEBUG\") # 1
|
||||
+ set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
||||
+ else()
|
||||
+ set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
||||
+ endif()
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
||||
!!ENDIF
|
||||
@@ -174,21 +184,22 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
|
||||
)
|
||||
|
||||
!!IF !isEmpty(CMAKE_STATIC_TYPE)
|
||||
- if(NOT "${IsDebugAndRelease}")
|
||||
- set(_genex_condition \"1\")
|
||||
+ #if(NOT "${IsDebugAndRelease}")
|
||||
+ # set(_genex_condition \"1\")
|
||||
+ #else()
|
||||
+ if("${Configuration}" STREQUAL "DEBUG")
|
||||
+ set(_genex_condition \"$<CONFIG:Debug>\")
|
||||
else()
|
||||
- if("${Configuration}" STREQUAL "DEBUG")
|
||||
- set(_genex_condition \"$<CONFIG:Debug>\")
|
||||
- else()
|
||||
- set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
|
||||
- endif()
|
||||
+ set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
|
||||
endif()
|
||||
+ #endif()
|
||||
|
||||
if(_static_deps)
|
||||
set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\")
|
||||
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
|
||||
\"${_static_deps_genex}\"
|
||||
)
|
||||
+ #message(STATUS \"Target Qt5::$${CMAKE_MODULE_NAME} static links: ${_static_dep} through ${_static_dep_genex}\") # Added for debugging
|
||||
endif()
|
||||
|
||||
set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\")
|
||||
@@ -205,13 +216,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
|
||||
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
|
||||
\"${_static_link_flags_genex}\"
|
||||
)
|
||||
+ #message(STATUS \"Target Qt5::$${CMAKE_MODULE_NAME} static link flags: ${_static_link_flags} through ${_static_link_flags_genex}\")
|
||||
endif()
|
||||
endif()
|
||||
!!ENDIF
|
||||
|
||||
!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
|
||||
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
+ if(\"${Configuration}\" STREQUAL \"DEBUG\")
|
||||
+ set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
+ else()
|
||||
+ set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
+ endif()
|
||||
!!ELSE
|
||||
set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
!!ENDIF
|
||||
@@ -373,13 +389,14 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
|
||||
!!IF !isEmpty(CMAKE_STATIC_TYPE)
|
||||
if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES)
|
||||
-!!IF !isEmpty(CMAKE_DEBUG_TYPE)
|
||||
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
+ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\")
|
||||
_qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
|
||||
+ \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
|
||||
_Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES
|
||||
_Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS
|
||||
)
|
||||
+ endif()
|
||||
!!ELSE
|
||||
_qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
|
||||
\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
|
||||
@@ -387,22 +404,21 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
_Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS
|
||||
)
|
||||
!!ENDIF
|
||||
-!!ENDIF
|
||||
|
||||
-!!IF !isEmpty(CMAKE_RELEASE_TYPE)
|
||||
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
+ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\")
|
||||
_qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
|
||||
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
|
||||
_Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
|
||||
_Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS
|
||||
)
|
||||
+ endif()
|
||||
!!ELSE
|
||||
_qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
|
||||
\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
|
||||
_Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
|
||||
_Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS
|
||||
)
|
||||
-!!ENDIF
|
||||
!!ENDIF
|
||||
endif()
|
||||
|
||||
@@ -466,7 +482,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
!!IF isEmpty(CMAKE_DEBUG_TYPE)
|
||||
!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
|
||||
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
|
||||
+ if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
|
||||
!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
|
||||
if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
|
||||
!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
|
||||
@@ -474,13 +490,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
|
||||
if (EXISTS
|
||||
!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
|
||||
+ \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
|
||||
!!ELSE
|
||||
\"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
|
||||
!!ENDIF
|
||||
AND EXISTS
|
||||
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
|
||||
+ \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
|
||||
!!ELSE
|
||||
\"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
|
||||
!!ENDIF
|
||||
@@ -543,7 +559,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
|
||||
|
||||
!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
|
||||
+ if(\"${Configuration}\" STREQUAL \"DEBUG\")
|
||||
+ set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
|
||||
+ else()
|
||||
+ set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
|
||||
+ endif()
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
|
||||
!!ENDIF
|
||||
@@ -557,15 +577,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
${_Qt5${Plugin}_STATIC_${Configuration}_LIB_DEPENDENCIES}
|
||||
)
|
||||
|
||||
- if(NOT "${IsDebugAndRelease}")
|
||||
- set(_genex_condition \"1\")
|
||||
+ #if(NOT "${IsDebugAndRelease}")
|
||||
+ # set(_genex_condition \"1\")
|
||||
+ #else()
|
||||
+ if("${Configuration}" STREQUAL "DEBUG")
|
||||
+ set(_genex_condition \"$<CONFIG:Debug>\")
|
||||
else()
|
||||
- if("${Configuration}" STREQUAL "DEBUG")
|
||||
- set(_genex_condition \"$<CONFIG:Debug>\")
|
||||
- else()
|
||||
- set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
|
||||
- endif()
|
||||
+ set(_genex_condition \"$<NOT:$<CONFIG:Debug>>\")
|
||||
endif()
|
||||
+ #endif()
|
||||
if(_static_deps)
|
||||
set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\")
|
||||
set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
index 5baf0fdb1..185abfffd 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
@@ -15,13 +15,14 @@ foreach(_module_dep ${_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES})
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
-!!IF !isEmpty(CMAKE_RELEASE_TYPE)
|
||||
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
-_qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
|
||||
- _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
|
||||
- _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS
|
||||
-)
|
||||
+if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\")
|
||||
+ _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
|
||||
+ \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
|
||||
+ _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
|
||||
+ _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS
|
||||
+ )
|
||||
+endif()
|
||||
!!ELSE
|
||||
_qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
|
||||
\"$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE
|
||||
@@ -29,15 +30,15 @@ _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
|
||||
_Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS
|
||||
)
|
||||
!!ENDIF
|
||||
-!!ENDIF
|
||||
|
||||
-!!IF !isEmpty(CMAKE_DEBUG_TYPE)
|
||||
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
-_qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
|
||||
- _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES
|
||||
- _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS
|
||||
-)
|
||||
+if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\")
|
||||
+ _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
|
||||
+ \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
|
||||
+ _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES
|
||||
+ _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS
|
||||
+ )
|
||||
+endif()
|
||||
!!ELSE
|
||||
_qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
|
||||
\"$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG
|
||||
@@ -45,19 +46,18 @@ _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
|
||||
_Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS
|
||||
)
|
||||
!!ENDIF
|
||||
-!!ENDIF
|
||||
|
||||
set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES
|
||||
\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_$${CMAKE_PLUGIN_NAME}_Import.cpp\"
|
||||
)
|
||||
!!ENDIF
|
||||
|
||||
-!!IF !isEmpty(CMAKE_RELEASE_TYPE)
|
||||
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE})
|
||||
-!!ENDIF
|
||||
-!!IF !isEmpty(CMAKE_DEBUG_TYPE)
|
||||
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE})
|
||||
-!!ENDIF
|
||||
+if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
|
||||
+ _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE})
|
||||
+endif()
|
||||
+if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
|
||||
+ _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE})
|
||||
+endif()
|
||||
|
||||
list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
|
||||
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY QT_ALL_PLUGINS_$${CMAKE_PLUGIN_TYPE_ESCAPED} Qt5::$${CMAKE_PLUGIN_NAME})
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
|
||||
index 4aa5dad46..cee6d2882 100644
|
||||
--- a/mkspecs/features/create_cmake.prf
|
||||
+++ b/mkspecs/features/create_cmake.prf
|
||||
@@ -212,10 +212,10 @@ contains(CONFIG, plugin) {
|
||||
CMAKE_PLUGIN_TYPE_ESCAPED = $$replace(PLUGIN_TYPE, [-/], _)
|
||||
|
||||
win32 {
|
||||
- !mingw|qtConfig(debug_and_release): debug_suffix="d"
|
||||
+ debug_suffix="d"
|
||||
|
||||
CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl
|
||||
CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl
|
||||
|
||||
isEmpty(CMAKE_STATIC_TYPE) {
|
||||
CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.dll
|
||||
@@ -294,6 +294,7 @@ CMAKE_INTERFACE_QT5_MODULE_DEPS = $$join(aux_lib_deps, ";")
|
||||
CMAKE_MODULE_PLUGIN_TYPES = $$join(QT.$${MODULE}.plugin_types, ";")
|
||||
|
||||
mac {
|
||||
+ CMAKE_FIND_OTHER_LIBRARY_BUILD = "true"
|
||||
!isEmpty(CMAKE_STATIC_TYPE) {
|
||||
CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a
|
||||
CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
|
||||
@@ -315,7 +316,7 @@ mac {
|
||||
CMAKE_WINDOWS_BUILD = "true"
|
||||
CMAKE_FIND_OTHER_LIBRARY_BUILD = "true"
|
||||
|
||||
- !mingw|qtConfig(debug_and_release): debug_suffix="d"
|
||||
+ debug_suffix="d"
|
||||
|
||||
CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
|
||||
CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
|
||||
@@ -340,6 +340,7 @@ mac {
|
||||
CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
|
||||
}
|
||||
} else {
|
||||
+ CMAKE_FIND_OTHER_LIBRARY_BUILD = "true"
|
||||
!isEmpty(CMAKE_STATIC_TYPE) {
|
||||
CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
|
||||
CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
|
||||
|
|
@ -0,0 +1,260 @@
|
|||
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
index 81db0d92c..51016f3fa 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-if (CMAKE_VERSION VERSION_LESS 3.1.0)
|
||||
- message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
|
||||
+if (CMAKE_VERSION VERSION_LESS 3.6.0) # Increase for cmake_parse_arguments
|
||||
+ message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.6.0\")
|
||||
endif()
|
||||
|
||||
!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
|
||||
@@ -34,6 +34,167 @@ set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")
|
||||
set(Qt5$${CMAKE_MODULE_NAME}_LIBRARIES Qt5::$${CMAKE_MODULE_NAME})
|
||||
!!ENDIF // TEMPLATE != aux
|
||||
|
||||
+###### Added by VCPKG
|
||||
+function(_qt5_$${CMAKE_MODULE_NAME}_parse_prl)
|
||||
+ cmake_parse_arguments(_qt_prl \"\" \"CONFIGURATION;TARGET;PRL_FILE;LIB_FILE;OUT_DEPS;OUT_FLAGS\" \"\" ${ARGN})
|
||||
+ if(NOT _qt_prl_CONFIGURATION)
|
||||
+ message(FATAL_ERROR \"qt_parse_prl requires parameter CONFIGURATION\")
|
||||
+ endif()
|
||||
+ if(NOT _qt_prl_TARGET)
|
||||
+ message(FATAL_ERROR \"qt_parse_prl requires parameter TARGET\")
|
||||
+ endif()
|
||||
+ if(NOT _qt_prl_PRL_FILE AND NOT _qt_prl_LIB_FILE)
|
||||
+ message(FATAL_ERROR \"qt_parse_prl requires parameter PRL_FILE or LIB_FILE\")
|
||||
+ endif()
|
||||
+ if(NOT _qt_prl_OUT_DEPS)
|
||||
+ message(FATAL_ERROR \"qt_parse_prl requires parameter OUT_DEPS\")
|
||||
+ endif()
|
||||
+ if(NOT _qt_prl_OUT_FLAGS)
|
||||
+ message(FATAL_ERROR \"qt_parse_prl requires parameter OUT_FLAGS\")
|
||||
+ endif()
|
||||
+
|
||||
+ if(_qt_prl_LIB_FILE)
|
||||
+ set(_parsed_prl \"${_qt_prl_LIB_FILE}\")
|
||||
+ string(REGEX REPLACE \"${CMAKE_STATIC_LIBRARY_SUFFIX}$\" \".prl\" _parsed_prl \"${_parsed_prl}\")
|
||||
+ else()
|
||||
+ set(_parsed_prl \"${_qt_prl_PRL_FILE}\")
|
||||
+ endif()
|
||||
+
|
||||
+ #message(STATUS \"Reading file: ${_parsed_prl}\")
|
||||
+ if(NOT EXISTS \"${_parsed_prl}\")
|
||||
+ message(FATAL_ERROR \"Could not find PRL file: ${_parsed_prl}\")
|
||||
+ endif()
|
||||
+ file(STRINGS \"${_parsed_prl}\" _static_depends REGEX \"^QMAKE_PRL_LIBS[ \\t]+=[ \\t]+.+$\")
|
||||
+ #message(STATUS \"QMAKE_PRL_LIBS from ${_parsed_prl} as read : ${_static_depends}\n\n\")
|
||||
+ string(REGEX REPLACE \"QMAKE_PRL_LIBS[ \\t]+=[ \\t]+\" \"\" _static_depends \"${_static_depends}\")
|
||||
+ string(REGEX REPLACE \" -L\\\\$\\\\$([^ ]+)\" [[ ;-L\$\$\\1; ]] _static_depends \"${_static_depends}\") # - L Normal Case
|
||||
+ if(WIN32)
|
||||
+ string(REGEX REPLACE \"-L\\\\\\\"([^\\\\\\\"]+)\\\\\\\"\" \" ;-L\\\"\\\\1\\\"; \" _static_depends \"${_static_depends}\") # -L Tricky Case with spaces
|
||||
+ string(REGEX REPLACE [[\\\"?[A-Z]:\\\\\\\\Program Files( \\(x86\\))*\\\\\\\\Windows Kits\\\\\\\\[0-9]+\\\\\\\\lib\\\\\\\\[0-9|.]+\\\\\\\\um\\\\\\\\x64(\\\\\\\\|/)([^\\\"]+)\\\"?]] \";\\\\3;\" _static_depends \"${_static_depends}\")
|
||||
+ string(REGEX REPLACE [[ \\\"([^\\"]+)\\\" ]] \" ;\\\"\\\\1\\\"; \" _static_depends \"${_static_depends}\")
|
||||
+ # Every path with a space in it should be handled now!
|
||||
+ else()
|
||||
+ string(REGEX REPLACE \" -l([^ ]+)\" [[;-l\\1;]] _static_depends \"${_static_depends}\") # - l case on targets other than windows
|
||||
+ endif()
|
||||
+ string(REGEX REPLACE \"[\\t ]+[^\\\\\\\"]([^( |\\\\\\\")]+)[^\\\\\\\"]([\\t ]+|[\\t ]*$)\" \";\\\\0; \" _static_depends \"${_static_depends}\")
|
||||
+ string(REGEX REPLACE \"[\\t ]*;[\\t ]*\" \";\" _static_depends \"${_static_depends}\") # remove unnecessary whitespaces
|
||||
+ string(REGEX REPLACE \"(;[\\t ]*;)+\" \";\" _static_depends \"${_static_depends}\") # remove empty elements from the list
|
||||
+ #string(REGEX REPLACE \" [\\"]\" \";\\\\\\\"\" _static_depends \"${_static_depends}\")
|
||||
+ #message(STATUS \"QMAKE_PRL_LIBS as a list : ${_static_depends}\n\n\")
|
||||
+
|
||||
+ #Logic Backported from Qt 5.14
|
||||
+ set(_search_paths)
|
||||
+ set(_fw_search_paths)
|
||||
+ set(_framework_flag)
|
||||
+ if(\"${_qt_prl_CONFIGURATION}\" STREQUAL \"DEBUG\")
|
||||
+ set(_prl_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${LIB_LOCATION}\")
|
||||
+ else()
|
||||
+ set(_prl_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${LIB_LOCATION}\")
|
||||
+ endif()
|
||||
+ string(REPLACE \"\$\$[QT_INSTALL_LIBS]/\" \"${_prl_location}\" _static_depends \"${_static_depends}\")
|
||||
+ string(REGEX REPLACE \"[ \t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\")
|
||||
+ foreach(_flag IN LISTS _static_depends)
|
||||
+ if(_flag MATCHES \"^-framework$\")
|
||||
+ # Handle the next flag as framework name
|
||||
+ set(_framework_flag 1)
|
||||
+ elseif(_flag MATCHES \"^-F(.*)$\")
|
||||
+ # Handle -F/foo/bar flags by recording the framework search paths to be used
|
||||
+ # by find_library.
|
||||
+ list(APPEND _fw_search_paths \"${CMAKE_MATCH_1}\")
|
||||
+ elseif(_framework_flag OR _flag MATCHES \"^-l(.*)$\")
|
||||
+ if(_framework_flag)
|
||||
+ # Handle Darwin framework bundles passed as -framework Foo
|
||||
+ unset(_framework_flag)
|
||||
+ set(_lib ${_flag})
|
||||
+ else()
|
||||
+ # Handle normal libraries passed as -lfoo
|
||||
+ set(_lib \"${CMAKE_MATCH_1}\")
|
||||
+ foreach(_standard_library ${_standard_libraries})
|
||||
+ if(_standard_library MATCHES \"^${_lib}(\\\\.lib)?$\")
|
||||
+ set(_lib_is_default_linked TRUE)
|
||||
+ break()
|
||||
+ endif()
|
||||
+ endforeach()
|
||||
+ endif()
|
||||
+ if (_lib_is_default_linked)
|
||||
+ unset(_lib_is_default_linked)
|
||||
+ elseif(_lib MATCHES \"^pthread$\")
|
||||
+ find_package(Threads REQUIRED)
|
||||
+ list(APPEND _lib_deps Threads::Threads)
|
||||
+ else()
|
||||
+ set(current_search_paths \"${_search_paths}\")
|
||||
+ if(_framework_flag)
|
||||
+ set(current_search_paths \"${_fw_search_paths}\")
|
||||
+ endif()
|
||||
+ if(current_search_paths)
|
||||
+ find_library(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH ${_lib} HINTS ${current_search_paths} NO_DEFAULT_PATH)
|
||||
+ endif()
|
||||
+ find_library(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH ${_lib})
|
||||
+ mark_as_advanced(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH)
|
||||
+ if(_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH)
|
||||
+ list(APPEND _lib_deps
|
||||
+ ${_Qt5$${CMAKE_MODULE_NAME}_${Configuration}_${_lib}_PATH}
|
||||
+ )
|
||||
+ else()
|
||||
+ message(FATAL_ERROR \"Library not found: ${_lib}\")
|
||||
+ endif()
|
||||
+ unset(_framework_flag)
|
||||
+ endif()
|
||||
+ elseif(EXISTS \"${_flag}\")
|
||||
+ # The flag is an absolute path to an existing library
|
||||
+ list(APPEND _lib_deps \"${_flag}\")
|
||||
+ elseif(_flag MATCHES \"^-L(.*)$\")
|
||||
+ # Handle -Lfoo flags by putting their paths in the search path used by find_library above
|
||||
+ list(APPEND _search_paths \"${CMAKE_MATCH_1}\")
|
||||
+ elseif(_flag MATCHES \"\\\.(lib|a|so)$\") #Library name only. No -l. Probably missing some cases
|
||||
+ #message(STATUS \"Added to link deps (${Configuration}): ${_flag}\")
|
||||
+ list(APPEND _lib_deps ${_flag}) # changed from _link_flags
|
||||
+ else()
|
||||
+ # Handle all remaining flags by simply passing them to the linker
|
||||
+ #message(STATUS \"Added to link flags (${Configuration}): ${_flag}\")
|
||||
+ list(APPEND _lib_flags ${_flag}) # changed from _link_flags
|
||||
+ endif()
|
||||
+ endforeach()
|
||||
+
|
||||
+ #message(STATUS \"${_qt_prl_TARGET} links (via PRL ${_qt_prl_CONFIGURATION}): ${_lib_deps}\")
|
||||
+ #message(STATUS \"${_qt_prl_TARGET} has linker flags (via PRL): ${_lib_flags}\")
|
||||
+ #get_target_property(_test_interface ${_qt_prl_TARGET} INTERFACE_LINK_LIBRARIES)
|
||||
+ #message(STATUS \"INTERFACE_LINK_LIBRARIES of target before ${_qt_prl_TARGET}: ${_test_interface} \")
|
||||
+ set(_prl_out_libs)
|
||||
+ foreach(_prl_lib IN LISTS _lib_deps)
|
||||
+ if(\"${_qt_prl_CONFIGURATION}\" STREQUAL \"DEBUG\")
|
||||
+ #message(STATUS \"DEBUG: ${_prl_lib}\")
|
||||
+ #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$<CONFIG:DEBUG>:${_prl_lib}>\")
|
||||
+ list(APPEND _prl_out_libs \"\\$<\\$<CONFIG:DEBUG>:${_prl_lib}>\")
|
||||
+ else()
|
||||
+ #message(STATUS \"RELEASE: ${_prl_lib}\")
|
||||
+ #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$<NOT:\\$<CONFIG:DEBUG>>:${_prl_lib}>\")
|
||||
+ list(APPEND _prl_out_libs \"\\$<\\$<NOT:\\$<CONFIG:DEBUG>>:${_prl_lib}>\")
|
||||
+ endif()
|
||||
+ endforeach()
|
||||
+ set(${_qt_prl_OUT_DEPS} "${_prl_out_libs}" PARENT_SCOPE)
|
||||
+ unset(_prl_lib)
|
||||
+
|
||||
+ set(_prl_out_flags)
|
||||
+ foreach(_prl_flag IN LISTS _lib_flags)
|
||||
+ if(\"${_qt_prl_CONFIGURATION}\" STREQUAL \"DEBUG\")
|
||||
+ #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$<CONFIG:DEBUG>:${_prl_flag}>\")
|
||||
+ list(APPEND _prl_out_flags \"\\$<\\$<CONFIG:DEBUG>:${_prl_flag}>\")
|
||||
+ else()
|
||||
+ #set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"\\$<\\$<NOT:\\$<CONFIG:DEBUG>>:${_prl_flag}>\")
|
||||
+ list(APPEND _prl_out_flags \"\\$<\\$<NOT:\\$<CONFIG:DEBUG>>:${_prl_flag}>\")
|
||||
+ endif()
|
||||
+ endforeach()
|
||||
+ set(${_qt_prl_OUT_FLAGS} "${_prl_out_flags}" PARENT_SCOPE)
|
||||
+ unset(_prl_flag)
|
||||
+
|
||||
+ #get_target_property(_test_interface ${_qt_prl_TARGET} INTERFACE_LINK_LIBRARIES)
|
||||
+ #message(STATUS \"INTERFACE_LINK_LIBRARIES of target after ${_qt_prl_TARGET}: ${_test_interface} \")
|
||||
+endfunction()
|
||||
+
|
||||
+###### END Added by VCPKG
|
||||
+
|
||||
+
|
||||
macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists file)
|
||||
if(NOT EXISTS \"${file}\" )
|
||||
message(FATAL_ERROR \"The imported target \\\"Qt5::$${CMAKE_MODULE_NAME}\\\" references the file
|
||||
@@ -52,6 +189,24 @@ endmacro()
|
||||
macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)
|
||||
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
|
||||
|
||||
+!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
|
||||
+!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
+ if(\"${Configuration}\" STREQUAL \"DEBUG\")
|
||||
+ set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
+ else()
|
||||
+ set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
+ endif()
|
||||
+!!ELSE
|
||||
+ set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
+!!ENDIF
|
||||
+ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
|
||||
+ if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
|
||||
+ set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
|
||||
+ \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
|
||||
+ )
|
||||
+ endif()
|
||||
+!!ENDIF
|
||||
+
|
||||
!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
|
||||
if(\"${Configuration}\" STREQUAL \"DEBUG\")
|
||||
set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
||||
@@ -60,35 +215,24 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
|
||||
endif()
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
||||
+!!ENDIF
|
||||
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
|
||||
+ _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::$${CMAKE_MODULE_NAME} LIB_FILE \"${imported_location}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS)
|
||||
+!!ELSE
|
||||
+ _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::$${CMAKE_MODULE_NAME} LIB_FILE \"${imported_implib}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS)
|
||||
!!ENDIF
|
||||
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
|
||||
+ set_property(TARGET ${_qt_prl_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES};${PRL_DEPS};${PRL_FLAGS}\")
|
||||
set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
|
||||
- \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
|
||||
+ #\"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES};${PRL_DEPS};${PRL_FLAGS}\"
|
||||
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
|
||||
!!IF !isEmpty(CMAKE_LIB_SONAME)
|
||||
\"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\"
|
||||
!!ENDIF
|
||||
# For backward compatibility with CMake < 2.8.12
|
||||
- \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
|
||||
+ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES};${PRL_DEPS};${PRL_FLAGS}\"
|
||||
)
|
||||
|
||||
-!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
|
||||
-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
- if(\"${Configuration}\" STREQUAL \"DEBUG\")
|
||||
- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
- else()
|
||||
- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
- endif()
|
||||
-!!ELSE
|
||||
- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
-!!ENDIF
|
||||
- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
|
||||
- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
|
||||
- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
|
||||
- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
|
||||
- )
|
||||
- endif()
|
||||
-!!ENDIF
|
||||
endmacro()
|
||||
!!ENDIF
|
||||
|
||||
@@ -366,6 +510,8 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
set_target_properties(Qt5::${Plugin} PROPERTIES
|
||||
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
|
||||
)
|
||||
+ _qt5_$${CMAKE_MODULE_NAME}_parse_prl(TARGET Qt5::${Plugin} LIB_FILE \"${imported_location}\" CONFIGURATION \"${Configuration}\" OUT_DEPS PRL_DEPS OUT_FLAGS PRL_FLAGS)
|
||||
+ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \"${PRL_DEPS};${PRL_FLAGS}\")
|
||||
endmacro()
|
||||
|
||||
if (pluginTargets)
|
||||
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
|
||||
index 7735e51..b3da640 100644 (file)
|
||||
--- a/src/corelib/Qt5CoreMacros.cmake
|
||||
+++ b/src/corelib/Qt5CoreMacros.cmake
|
||||
@@ -59,7 +59,14 @@ macro(QT5_MAKE_OUTPUT_FILE infile prefix ext outfile )
|
||||
set(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
|
||||
string(REPLACE ".." "__" _outfile ${_outfile})
|
||||
get_filename_component(outpath ${_outfile} PATH)
|
||||
- string(REGEX REPLACE "\\.[^.]*$" "" _outfile ${_outfile})
|
||||
+ if(CMAKE_VERSION VERSION_LESS "3.14")
|
||||
+ get_filename_component(_outfile_ext ${_outfile} EXT)
|
||||
+ get_filename_component(_outfile_ext ${_outfile_ext} NAME_WE)
|
||||
+ get_filename_component(_outfile ${_outfile} NAME_WE)
|
||||
+ string(APPEND _outfile ${_outfile_ext})
|
||||
+ else()
|
||||
+ get_filename_component(_outfile ${_outfile} NAME_WLE)
|
||||
+ endif()
|
||||
file(MAKE_DIRECTORY ${outpath})
|
||||
set(${outfile} ${outpath}/${prefix}${_outfile}.${ext})
|
||||
endmacro()
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
diff --git a/src/gui/configure.json b/src/gui/configure.json
|
||||
index 9a749516b..242f47504 100644
|
||||
--- a/src/gui/configure.json
|
||||
+++ b/src/gui/configure.json
|
||||
@@ -568,7 +568,9 @@
|
||||
},
|
||||
"headers": "X11/Xlib.h",
|
||||
"sources": [
|
||||
- { "type": "makeSpec", "spec": "X11" }
|
||||
+ { "type": "makeSpec", "spec": "X11" },
|
||||
+ { "type": "pkgConfig", "args": "x11" },
|
||||
+ { "type": "pkgConfig", "args": "x11 --static" }
|
||||
]
|
||||
},
|
||||
"x11sm": {
|
||||
@@ -590,6 +592,7 @@
|
||||
"headers": "xcb/xcb.h",
|
||||
"sources": [
|
||||
{ "type": "pkgConfig", "args": "xcb >= 1.9" },
|
||||
+ { "type": "pkgConfig", "args": "xcb >= 1.9 --static" },
|
||||
"-lxcb"
|
||||
]
|
||||
},
|
||||
@@ -691,6 +694,7 @@
|
||||
"headers": "X11/Xlib-xcb.h",
|
||||
"sources": [
|
||||
{ "type": "pkgConfig", "args": "x11-xcb" },
|
||||
+ { "type": "pkgConfig", "args": "x11-xcb --static" },
|
||||
"-lX11-xcb"
|
||||
],
|
||||
"use": "xcb xlib"
|
||||
@@ -711,6 +715,7 @@
|
||||
"headers": "xcb/xkb.h",
|
||||
"sources": [
|
||||
{ "type": "pkgConfig", "args": "xcb-xkb >= 1.10" },
|
||||
+ { "type": "pkgConfig", "args": "xcb-xkb >= 1.10 --static" },
|
||||
"-lxcb-xkb"
|
||||
],
|
||||
"use": "xcb"
|
||||
|
|
@ -10,13 +10,26 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
|
|||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
|
||||
|
||||
if("latest" IN_LIST FEATURES)
|
||||
set(QT_BUILD_LATEST ON)
|
||||
set(QT_BUILD_LATEST ON)
|
||||
set(PATCHES
|
||||
patches/Qt5BasicConfig_latest.patch
|
||||
patches/Qt5PluginTarget_latest.patch
|
||||
patches/create_cmake.patch
|
||||
)
|
||||
else()
|
||||
set(PATCHES
|
||||
patches/Qt5BasicConfig.patch
|
||||
patches/Qt5PluginTarget.patch
|
||||
patches/prl_parser.patch # Modified backport of the prl parser from Qt5.14.1 without using QMAKE_PRL_LIBS_FOR_CMAKE
|
||||
patches/qt_moc.patch # Already merged upstream https://codereview.qt-project.org/c/qt/qtbase/+/288359
|
||||
)
|
||||
endif()
|
||||
|
||||
include(qt_port_functions)
|
||||
include(configure_qt)
|
||||
include(install_qt)
|
||||
|
||||
|
||||
#########################
|
||||
## Find Host and Target mkspec name for configure
|
||||
include(find_qt_mkspec)
|
||||
|
|
@ -39,12 +52,12 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH
|
|||
patches/qt_app.patch #Moves the target location of qt5 host apps to always install into the host dir.
|
||||
patches/gui_configure.patch #Patches the gui configure.json to break freetype/fontconfig autodetection because it does not include its dependencies.
|
||||
patches/icu.patch #Help configure find static icu builds in vcpkg on windows
|
||||
patches/xlib.patch #Patches Xlib check to actually use Pkgconfig instead of makeSpec only
|
||||
#patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static).
|
||||
#Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the
|
||||
#the windows supplied gl.h header and the angle gl.h otherwise.
|
||||
#CMake fixes
|
||||
patches/Qt5BasicConfig.patch
|
||||
patches/Qt5PluginTarget.patch
|
||||
${PATCHES}
|
||||
patches/Qt5GuiConfigExtras.patch # Patches the library search behavior for EGL since angle is not build with Qt
|
||||
)
|
||||
|
||||
|
|
@ -191,7 +204,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
|
|||
"OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib"
|
||||
)
|
||||
elseif(VCPKG_TARGET_IS_LINUX)
|
||||
list(APPEND CORE_OPTIONS -fontconfig)
|
||||
list(APPEND CORE_OPTIONS -fontconfig -xcb-xlib -linuxfb) #-system-xcb
|
||||
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()
|
||||
|
|
@ -264,7 +277,6 @@ else()
|
|||
OPTIONS_RELEASE ${RELEASE_OPTIONS}
|
||||
OPTIONS_DEBUG ${DEBUG_OPTIONS}
|
||||
)
|
||||
|
||||
install_qt()
|
||||
|
||||
#########################
|
||||
|
|
@ -291,8 +303,8 @@ else()
|
|||
|
||||
#This needs a new VCPKG policy or a static angle build (ANGLE needs to be fixed in VCPKG!)
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND ${VCPKG_LIBRARY_LINKAGE} MATCHES "static") # Move angle dll libraries
|
||||
message(STATUS "Moving ANGLE dlls from /bin to /tools/qt5-angle/bin. In static builds dlls are not allowed in /bin")
|
||||
if(EXISTS "${CURRENT_PACKAGES_DIR}/bin")
|
||||
message(STATUS "Moving ANGLE dlls from /bin to /tools/qt5-angle/bin. In static builds dlls are not allowed in /bin")
|
||||
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/qt5-angle)
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/qt5-angle/bin)
|
||||
if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin)
|
||||
|
|
@ -303,9 +315,9 @@ else()
|
|||
endif()
|
||||
|
||||
## Fix location of qtmain(d).lib. Has been moved into manual-link. Add debug version
|
||||
set(cmakefile "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Core/Qt5CoreConfigExtras.cmake")
|
||||
file(READ "${cmakefile}" _contents)
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_BUILD_TYPE)
|
||||
set(cmakefile "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Core/Qt5CoreConfigExtras.cmake")
|
||||
file(READ "${cmakefile}" _contents)
|
||||
string(REPLACE "set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)" "set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG)" _contents "${_contents}")
|
||||
string(REPLACE
|
||||
[[set(imported_location "${_qt5Core_install_prefix}/lib/qtmain.lib")]]
|
||||
|
|
@ -321,15 +333,34 @@ else()
|
|||
IMPORTED_LOCATION_DEBUG ${imported_location_debug}
|
||||
)]]
|
||||
_contents "${_contents}")
|
||||
file(WRITE "${cmakefile}" "${_contents}")
|
||||
else() # Single configuration build (either debug or release)
|
||||
# Release case
|
||||
string(REPLACE
|
||||
[[set(imported_location "${_qt5Core_install_prefix}/lib/qtmain.lib")]]
|
||||
[[set(imported_location "${_qt5Core_install_prefix}/lib/manual-link/qtmain.lib")]]
|
||||
_contents "${_contents}")
|
||||
# Debug case (whichever will match)
|
||||
string(REPLACE
|
||||
[[set(imported_location "${_qt5Core_install_prefix}/lib/qtmaind.lib")]]
|
||||
[[set(imported_location "${_qt5Core_install_prefix}/debug/lib/manual-link/qtmaind.lib")]]
|
||||
_contents "${_contents}")
|
||||
string(REPLACE
|
||||
[[set(imported_location "${_qt5Core_install_prefix}/debug/lib/qtmaind.lib")]]
|
||||
[[set(imported_location "${_qt5Core_install_prefix}/debug/lib/manual-link/qtmaind.lib")]]
|
||||
_contents "${_contents}")
|
||||
endif()
|
||||
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5core)
|
||||
file(WRITE "${cmakefile}" "${_contents}")
|
||||
|
||||
if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5/bin)
|
||||
file(COPY ${CURRENT_PACKAGES_DIR}/tools/qt5/bin DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
|
||||
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin)
|
||||
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qt5/bin)
|
||||
endif()
|
||||
# This should be removed if possible! (Currently debug build of qt5-translations requires it.)
|
||||
if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/tools/qt5/bin)
|
||||
file(COPY ${CURRENT_PACKAGES_DIR}/tools/qt5/bin DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5/debug)
|
||||
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qt5/debug/bin)
|
||||
endif()
|
||||
|
||||
if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf)
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf")
|
||||
|
|
@ -370,4 +401,21 @@ if(QT_BUILD_LATEST)
|
|||
DESTINATION
|
||||
${CURRENT_PACKAGES_DIR}/share/qt5
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# #Code to get generated CMake files from CI
|
||||
# file(RENAME "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Core/Qt5CoreConfig.cmake" "${CURRENT_BUILDTREES_DIR}/Qt5CoreConfig.cmake.log")
|
||||
# file(GLOB_RECURSE CMAKE_GUI_FILES "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Gui/*.cmake" )
|
||||
# foreach(cmake_file ${CMAKE_GUI_FILES})
|
||||
# get_filename_component(cmake_filename "${cmake_file}" NAME)
|
||||
# file(COPY "${cmake_file}" DESTINATION "${CURRENT_BUILDTREES_DIR}")
|
||||
# file(RENAME "${CURRENT_BUILDTREES_DIR}/${cmake_filename}" "${CURRENT_BUILDTREES_DIR}/${cmake_filename}.log")
|
||||
# endforeach()
|
||||
# #Copy config.log from buildtree/triplet to buildtree to get the log in CI in case of failure
|
||||
# if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.log")
|
||||
# file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.log" "${CURRENT_BUILDTREES_DIR}/config-rel.log")
|
||||
# endif()
|
||||
# if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.log")
|
||||
# file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.log" "${CURRENT_BUILDTREES_DIR}/config-dbg.log")
|
||||
# endif()
|
||||
# message(FATAL_ERROR "Need Info from CI!")
|
||||
|
|
|
|||
|
|
@ -1,79 +0,0 @@
|
|||
_find_package(${ARGS})
|
||||
|
||||
function(add_qt_library _target)
|
||||
foreach(_lib IN LISTS ARGN)
|
||||
#The fact that we are within this file means we are using the VCPKG toolchain. Has such we only need to search in VCPKG paths!
|
||||
find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}_debug ${_lib}d ${_lib} NAMES_PER_DIR PATH_SUFFIXES lib plugins/platforms PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)
|
||||
find_library(${_lib}_LIBRARY_RELEASE NAMES ${_lib} NAMES_PER_DIR PATH_SUFFIXES lib plugins/platforms PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
|
||||
if(${_lib}_LIBRARY_RELEASE)
|
||||
list(APPEND interface_lib \$<\$<NOT:\$<CONFIG:DEBUG>>:${${_lib}_LIBRARY_RELEASE}>)
|
||||
endif()
|
||||
if(${_lib}_LIBRARY_DEBUG)
|
||||
list(APPEND interface_lib \$<\$<CONFIG:DEBUG>:${${_lib}_LIBRARY_DEBUG}>)
|
||||
endif()
|
||||
set_property(TARGET ${_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${interface_lib})
|
||||
endforeach()
|
||||
endfunction()
|
||||
|
||||
get_target_property(_target_type Qt5::Core TYPE)
|
||||
if("${_target_type}" STREQUAL "STATIC_LIBRARY")
|
||||
find_package(ZLIB)
|
||||
find_package(JPEG)
|
||||
find_package(PNG)
|
||||
find_package(Freetype)
|
||||
find_package(sqlite3 CONFIG)
|
||||
find_package(PostgreSQL MODULE REQUIRED)
|
||||
find_package(double-conversion CONFIG)
|
||||
find_package(OpenSSL)
|
||||
find_package(harfbuzz CONFIG)
|
||||
|
||||
set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES
|
||||
ZLIB::ZLIB JPEG::JPEG PNG::PNG Freetype::Freetype sqlite3 harfbuzz::harfbuzz
|
||||
double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto PostgreSQL::PostgreSQL
|
||||
)
|
||||
|
||||
add_qt_library(Qt5::Core
|
||||
pcre2-16
|
||||
icuin icui18n
|
||||
icutu icuuc icuio
|
||||
icudt icudata
|
||||
Qt5ThemeSupport
|
||||
Qt5EventDispatcherSupport
|
||||
Qt5PlatformCompositorSupport
|
||||
Qt5FontDatabaseSupport)
|
||||
|
||||
if(MSVC)
|
||||
set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES
|
||||
Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib Imm32.lib)
|
||||
|
||||
add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d)
|
||||
elseif(UNIX AND NOT APPLE)
|
||||
add_qt_library(Qt5::Core
|
||||
Qt5GraphicsSupport
|
||||
Qt5ClipboardSupport
|
||||
Qt5AccessibilitySupport)
|
||||
elseif(APPLE)
|
||||
set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES
|
||||
"-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices"
|
||||
"-weak_framework AppKit" "-weak_framework Security" "-weak_framework ApplicationServices"
|
||||
"-weak_framework CoreFoundation" "-weak_framework SystemConfiguration"
|
||||
"-weak_framework Carbon"
|
||||
"-weak_framework QuartzCore"
|
||||
"-weak_framework CoreVideo"
|
||||
"-weak_framework Metal"
|
||||
"-weak_framework CoreText"
|
||||
"-weak_framework ApplicationServices"
|
||||
"-weak_framework CoreGraphics"
|
||||
"-weak_framework OpenGL"
|
||||
"-weak_framework AGL"
|
||||
"-weak_framework ImageIO"
|
||||
"z" "m"
|
||||
cups)
|
||||
add_qt_library(Qt5::Core
|
||||
Qt5GraphicsSupport
|
||||
Qt5ClipboardSupport
|
||||
Qt5AccessibilitySupport
|
||||
qcocoa)
|
||||
endif()
|
||||
|
||||
endif()
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
Source: qt5-canvas3d
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Canvas 3d Module;
|
||||
Build-Depends: qt5-base
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
|
||||
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
|
||||
qt_submodule_installation()
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-charts
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models
|
||||
Build-Depends: qt5-base, qt5-declarative, qt5-multimedia
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-connectivity
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware
|
||||
Build-Depends: qt5-base
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-datavis3d
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations
|
||||
Build-Depends: qt5-base, qt5-declarative, qt5-multimedia
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-declarative
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.
|
||||
Build-Depends: qt5-base, qt5-imageformats, qt5-svg
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
Source: qt5-doc
|
||||
Version: 5.12.7
|
||||
Description: Qt5 doc Module;
|
||||
Build-Depends: qt5-base, qt5-declarative, qt5-quickcontrols2, qt5-tools
|
||||
Supports: linux
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
||||
message(STATUS "${PORT} will not build any artifacts on Windows!")
|
||||
endif()
|
||||
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
|
||||
qt_submodule_installation()
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-gamepad
|
||||
Version: 5.12.5-2
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware
|
||||
Build-Depends: qt5-base, qt5-declarative
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-graphicaleffects
|
||||
Version: 5.12.5-2
|
||||
Version: 5.12.7
|
||||
Description: Qt5 GraphicalEffects Module.
|
||||
Build-Depends: qt5-base, qt5-declarative
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-imageformats
|
||||
Version: 5.12.5-3
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP
|
||||
Build-Depends: qt5-base, tiff, libwebp, jasper
|
||||
|
|
|
|||
|
|
@ -8,9 +8,13 @@ list(APPEND CORE_OPTIONS
|
|||
-jasper
|
||||
-no-mng # must be explicitly disabled to not automatically pick up mng
|
||||
-verbose)
|
||||
|
||||
|
||||
find_library(TIFF_RELEASE NAMES tiff PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on lzma
|
||||
find_library(TIFF_DEBUG NAMES tiffd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
|
||||
find_library(JPEG_RELEASE NAMES jpeg jpeg-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
|
||||
find_library(JPEG_DEBUG NAMES jpeg jpeg-static jpegd jpeg-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
|
||||
find_library(ZLIB_RELEASE NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
|
||||
find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
|
||||
|
||||
find_library(JASPER_RELEASE NAMES jasper PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
|
||||
find_library(JASPER_DEBUG NAMES jasperd jasper libjasperd libjasper PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
|
||||
|
|
@ -23,6 +27,10 @@ find_library(WEBP_RELEASE NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEF
|
|||
find_library(WEBP_DEBUG NAMES webpd webp PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
|
||||
find_library(WEBPDEMUX_RELEASE NAMES webpdemux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
|
||||
find_library(WEBPDEMUX_DEBUG NAMES webpdemuxd webpdemux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
|
||||
find_library(WEBPMUX_RELEASE NAMES webpmux libwebpmux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
|
||||
find_library(WEBPMUX_DEBUG NAMES webpmuxd webpmux libwebpmuxd libwebpmux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
|
||||
find_library(WEBPDECODER_RELEASE NAMES webpdecoder libwebpdecoder PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
|
||||
find_library(WEBPDECODER_DEBUG NAMES webpdecoder libwebpdecoder webpdecoderd libwebpdecoderd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
|
||||
# Depends on opengl in default build but might depend on giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut (!osx), sdl1 (windows)
|
||||
# which would require extra libraries to be linked e.g. giflib freeglut sdl1 other ones are already linked
|
||||
|
||||
|
|
@ -30,10 +38,17 @@ find_library(WEBPDEMUX_DEBUG NAMES webpdemuxd webpdemux PATHS "${CURRENT_INSTALL
|
|||
find_library(LZMA_RELEASE lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
|
||||
find_library(LZMA_DEBUG lzmad lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
|
||||
|
||||
set(OPT_REL "TIFF_LIBS=${TIFF_RELEASE} ${LZMA_RELEASE}"
|
||||
"WEBP_LIBS=${WEBP_RELEASE} ${WEBPDEMUX_RELEASE}"
|
||||
"JASPER_LIBS=${JASPER_RELEASE} ${FREEGLUT_RELEASE}") # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies
|
||||
set(OPT_DBG "TIFF_LIBS=${TIFF_DEBUG} ${LZMA_DEBUG}"
|
||||
"WEBP_LIBS=${WEBP_DEBUG} ${WEBPDEMUX_DEBUG}"
|
||||
"JASPER_LIBS=${JASPER_DEBUG} ${FREEGLUT_DEBUG}")
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
string(APPEND WEBP_RELEASE " -pthread")
|
||||
string(APPEND WEBP_DEBUG " -pthread")
|
||||
endif()
|
||||
|
||||
set(OPT_REL "TIFF_LIBS=${TIFF_RELEASE} ${LZMA_RELEASE} ${JPEG_RELEASE} ${ZLIB_RELEASE}"
|
||||
"WEBP_LIBS=${WEBPDECODER_RELEASE} ${WEBPDEMUX_RELEASE} ${WEBPMUX_RELEASE} ${WEBP_RELEASE}"
|
||||
"JASPER_LIBS=${JASPER_RELEASE} ${FREEGLUT_RELEASE} ${JPEG_RELEASE} ${ZLIB_RELEASE}") # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies
|
||||
set(OPT_DBG "TIFF_LIBS=${TIFF_DEBUG} ${LZMA_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}"
|
||||
"WEBP_LIBS=${WEBPDECODER_DEBUG} ${WEBPDEMUX_DEBUG} ${WEBPMUX_DEBUG} ${WEBP_DEBUG}"
|
||||
"JASPER_LIBS=${JASPER_DEBUG} ${FREEGLUT_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}")
|
||||
list(APPEND CORE_OPTIONS "WEBP_INCDIR=${CURRENT_INSTALLED_DIR}/include") # Requires libwebp[all]
|
||||
|
||||
qt_submodule_installation(BUILD_OPTIONS ${CORE_OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG})
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-location
|
||||
Version: 5.12.5-2
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application.
|
||||
Build-Depends: qt5-base, qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Source: qt5-macextras
|
||||
Version: 5.12.5
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Mac Extras Module. Provides platform-specific APIs for mac.
|
||||
Build-Depends: qt5-base
|
||||
Supports: osx
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-mqtt
|
||||
Version: 5.12.5
|
||||
Version: 5.12.7
|
||||
Description: Qt5 MQTT module.
|
||||
Build-Depends: qt5-base
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-multimedia
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality
|
||||
Build-Depends: qt5-base, qt5-declarative
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-networkauth
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Network Authorization Module
|
||||
Build-Depends: qt5-base
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-purchasing
|
||||
Version: 5.12.5-2
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.
|
||||
Build-Depends: qt5-base, qt5-declarative
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-quickcontrols
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 QuickControls Module.
|
||||
Build-Depends: qt5-base, qt5-declarative, qt5-graphicaleffects
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-quickcontrols2
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 QuickControls2 Module.
|
||||
Build-Depends: qt5-base, qt5-declarative, qt5-imageformats
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-remoteobjects
|
||||
Version: 5.12.5-2
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.
|
||||
Build-Depends: qt5-base, qt5-declarative
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-script
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Build-Depends: qt5-base, qt5-tools
|
||||
Description:Qt5 Script Module.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-scxml
|
||||
Version: 5.12.5
|
||||
Version: 5.12.7
|
||||
Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications
|
||||
Build-Depends: qt5-base, qt5-declarative
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-sensors
|
||||
Version: 5.12.5-2
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.
|
||||
Build-Depends: qt5-base, qt5-declarative
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
Source: qt5-serialbus
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Serialbus Module;
|
||||
Build-Depends: qt5-base, qt5-serialport
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
|
||||
qt_submodule_installation()
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-serialport
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Serial Port - provides access to hardware and virtual serial ports
|
||||
Build-Depends: qt5-base
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-speech
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Speech Module
|
||||
Build-Depends: qt5-base, atlmfc (windows), qt5-declarative, qt5-multimedia
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-svg
|
||||
Version: 5.12.5
|
||||
Version: 5.12.7
|
||||
Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files
|
||||
Build-Depends: qt5-base
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-tools
|
||||
Version: 5.12.5-5
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications
|
||||
Build-Depends: qt5-base, qt5-declarative, qt5-activeqt (windows)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
Source: qt5-translations
|
||||
Version: 5.12.7
|
||||
Description: Qt5 translations module
|
||||
Build-Depends: qt5-base, qt5-tools
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
|
||||
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
|
||||
qt_submodule_installation()
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-virtualkeyboard
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes
|
||||
Build-Depends: qt5-svg, qt5-quickcontrols, qt5-multimedia, qt5-quickcontrols
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
Source: qt5-wayland
|
||||
Version: 5.12.7
|
||||
Description: Qt5 wayland Module;
|
||||
Build-Depends: qt5-base
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
#Will not build on Windows!
|
||||
message(WARNING "This port is just a placeholder until the required wayland libraries have been added into VCPKG! \
|
||||
As such the build will most likely fail until your system has the required wayland libraries installed (untested)")
|
||||
|
||||
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
|
||||
qt_submodule_installation()
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-webchannel
|
||||
Version: 5.12.5-2
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.
|
||||
Build-Depends: qt5-base, qt5-declarative
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
Source: qt5-webengine
|
||||
Version: 5.12.7-1
|
||||
Description: Qt5 webengine Module;
|
||||
Build-Depends: qt5-base, qt5-declarative, qt5-location, qt5-quickcontrols, qt5-quickcontrols2, qt5-tools, qt5-webchannel
|
||||
Supports: !static
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
|
||||
#latest diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
|
||||
index 97d39535c..dc09da43a 100644
|
||||
--- a/src/core/config/common.pri
|
||||
+++ b/src/core/config/common.pri
|
||||
@@ -57,5 +57,5 @@
|
||||
precompile_header {
|
||||
- gn_args += enable_precompiled_headers=true
|
||||
+ gn_args += enable_precompiled_headers=false
|
||||
} else {
|
||||
gn_args += enable_precompiled_headers=false
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h b/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h
|
||||
index d54583e8b..1921185f8 100644
|
||||
--- a/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h
|
||||
+++ b/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h
|
||||
@@ -16,7 +16,7 @@
|
||||
namespace gl {
|
||||
|
||||
class GLContext;
|
||||
-
|
||||
+typedef void *GLeglImageOES;
|
||||
typedef void(GL_BINDING_CALL* glActiveTextureProc)(GLenum texture);
|
||||
typedef void(GL_BINDING_CALL* glApplyFramebufferAttachmentCMAAINTELProc)(void);
|
||||
typedef void(GL_BINDING_CALL* glAttachShaderProc)(GLuint program,
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
||||
#set(VCPKG_BUILD_TYPE release) #You probably want to set this to reduce build type and space requirements
|
||||
message(STATUS "${PORT} requires a lot of free disk space (>300GB), ram (>32 GB) and time (>4h per configuration) to be successfully build.\n\
|
||||
-- As such ${PORT} is not properly tested.\n\
|
||||
-- If ${PORT} fails post build validation please open up an issue. \n\
|
||||
-- If it fails due to post validation the successfully installed files can be found in <vcpkgroot>/packages/${PORT}_${TARGET_TRIPLET} \n\
|
||||
-- and just need to be copied into <vcpkgroot>/installed/${TARGaET_TRIPLET}")
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
message(STATUS "If ${PORT} directly fails ${PORT} might require additional prerequisites on Linux and OSX. Please check the configure logs.\n")
|
||||
endif()
|
||||
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
|
||||
|
||||
vcpkg_find_acquire_program(FLEX)
|
||||
vcpkg_find_acquire_program(BISON)
|
||||
vcpkg_find_acquire_program(GPERF)
|
||||
vcpkg_find_acquire_program(PYTHON2)
|
||||
vcpkg_find_acquire_program(NINJA)
|
||||
get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY )
|
||||
get_filename_component(BISON_DIR "${BISON}" DIRECTORY )
|
||||
get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY )
|
||||
get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY )
|
||||
get_filename_component(NINJA_DIR "${GPERF}" DIRECTORY )
|
||||
|
||||
if(WIN32) # WIN32 HOST probably has win_flex and win_bison!
|
||||
if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
||||
file(CREATE_LINK "${FLEX}" "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
||||
endif()
|
||||
if(NOT EXISTS "${BISON_DIR}/BISON${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
||||
file(CREATE_LINK "${BISON}" "${BISON_DIR}/bison${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
|
||||
vcpkg_add_to_path(PREPEND "${BISON_DIR}")
|
||||
vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}")
|
||||
vcpkg_add_to_path(PREPEND "${GPERF_DIR}")
|
||||
vcpkg_add_to_path(PREPEND "${NINJA_DIR}")
|
||||
|
||||
qt_submodule_installation(PATCHES
|
||||
common.pri.patch
|
||||
gl.patch)
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
Source: qt5-webglplugin
|
||||
Version: 5.12.7
|
||||
Description: Qt5 webglplugin Module;
|
||||
Build-Depends: qt5-base
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
|
||||
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
|
||||
qt_submodule_installation()
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-websockets
|
||||
Version: 5.12.5
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455
|
||||
Build-Depends: qt5-base, qt5-declarative
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-webview
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.
|
||||
Build-Depends: qt5-declarative
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Source: qt5-winextras
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.
|
||||
Build-Depends: qt5-base, atlmfc (windows), qt5-declarative, qt5-multimedia
|
||||
Supports: windows
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
Source: qt5-x11extras
|
||||
Version: 5.12.7
|
||||
Description: Qt5 x11extras Module;
|
||||
Build-Depends: qt5-base
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
|
||||
qt_submodule_installation()
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
Source: qt5-xmlpatterns
|
||||
Version: 5.12.5-1
|
||||
Version: 5.12.7
|
||||
Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation
|
||||
Build-Depends: qt5-base, qt5-declarative
|
||||
|
|
|
|||
|
|
@ -1,9 +1,174 @@
|
|||
Source: qt5
|
||||
Version: 5.12.5
|
||||
Version: 5.12.7
|
||||
Homepage: https://www.qt.io/
|
||||
Description: Qt5 Application Framework
|
||||
Build-Depends: qt5-3d, qt5-activeqt (windows), qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-location, qt5-multimedia, qt5-mqtt, qt5-networkauth, qt5-purchasing, qt5-quickcontrols, qt5-quickcontrols2, qt5-script, qt5-scxml, qt5-sensors, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-webchannel, qt5-websockets, qt5-winextras (windows), qt5-macextras (osx), qt5-xmlpatterns
|
||||
Build-Depends: qt5-base
|
||||
Default-Features: essentials, default
|
||||
|
||||
Feature: essentials
|
||||
Build-Depends: qt5[core, tools, networkauth, quickcontrols2, multimedia, imageformats, declarative, svg, activeqt]
|
||||
Description: Build the essential qt modules
|
||||
|
||||
Feature: latest
|
||||
Build-Depends: qt5-base[latest]
|
||||
Description: Build latest qt version (5.13.1) instead of LTS
|
||||
Build-Depends: qt5-base[core, latest]
|
||||
Description: Build latest qt version (5.14.1) instead of LTS
|
||||
|
||||
Feature: default
|
||||
Build-Depends: qt5[core, 3d, webchannel, websockets, extras, sensors, serialport, speech, virtualkeyboard, purchasing, scxml, charts, datavis3d, gamepad, graphicaleffects, location, webglplugin, webview, translations, remoteobjects, connectivity]
|
||||
Description: Build the essential qt modules
|
||||
|
||||
Feature: all
|
||||
Build-Depends: qt5[3d, webchannel, websockets, extras, xmlpatterns, sensors, serialport, speech, svg, tools, virtualkeyboard, networkauth, purchasing, quickcontrols, quickcontrols2, script, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, imageformats, location, multimedia, mqtt, webglplugin, webview, serialbus, translations, doc, remoteobjects, connectivity], qt5[core,webengine] (!static), qt5[core,wayland] (!windows)
|
||||
Description: Install all Qt5 submodules (Warning: Could take a long time and fail...)
|
||||
|
||||
Feature: extras
|
||||
Build-Depends: qt5-winextras (windows), qt5-macextras (osx), qt5-x11extras (linux), qt5-androidextras (android)
|
||||
Description:
|
||||
|
||||
Feature: 3d
|
||||
Build-Depends: qt5-3d
|
||||
Description:
|
||||
|
||||
Feature: webchannel
|
||||
Build-Depends: qt5-webchannel
|
||||
Description:
|
||||
|
||||
Feature: websockets
|
||||
Build-Depends: qt5-websockets
|
||||
Description:
|
||||
|
||||
Feature: xmlpatterns
|
||||
Build-Depends: qt5-xmlpatterns
|
||||
Description: (deprecated)
|
||||
|
||||
Feature: sensors
|
||||
Build-Depends: qt5-sensors
|
||||
Description:
|
||||
|
||||
Feature: serialport
|
||||
Build-Depends: qt5-serialport
|
||||
Description:
|
||||
|
||||
Feature: speech
|
||||
Build-Depends: qt5-speech
|
||||
Description:
|
||||
|
||||
Feature: svg
|
||||
Build-Depends: qt5-svg
|
||||
Description:
|
||||
|
||||
Feature: tools
|
||||
Build-Depends: qt5-tools
|
||||
Description:
|
||||
|
||||
Feature: virtualkeyboard
|
||||
Build-Depends: qt5-virtualkeyboard
|
||||
Description:
|
||||
|
||||
Feature: networkauth
|
||||
Build-Depends: qt5-networkauth
|
||||
Description:
|
||||
|
||||
Feature: purchasing
|
||||
Build-Depends: qt5-purchasing
|
||||
Description:
|
||||
|
||||
Feature: quickcontrols
|
||||
Build-Depends: qt5-quickcontrols
|
||||
Description: (deprecated)
|
||||
|
||||
Feature: quickcontrols2
|
||||
Build-Depends: qt5-quickcontrols2
|
||||
Description:
|
||||
|
||||
Feature: script
|
||||
Build-Depends: qt5-script
|
||||
Description: (deprecated)
|
||||
|
||||
Feature: scxml
|
||||
Build-Depends: qt5-scxml
|
||||
Description:
|
||||
|
||||
Feature: activeqt
|
||||
Build-Depends: qt5-activeqt (windows)
|
||||
Description: Windows Only
|
||||
|
||||
Feature: charts
|
||||
Build-Depends: qt5-charts
|
||||
Description:
|
||||
|
||||
Feature: datavis3d
|
||||
Build-Depends: qt5-datavis3d
|
||||
Description:
|
||||
|
||||
Feature: declarative
|
||||
Build-Depends: qt5-declarative
|
||||
Description:
|
||||
|
||||
Feature: gamepad
|
||||
Build-Depends: qt5-gamepad
|
||||
Description:
|
||||
|
||||
Feature: graphicaleffects
|
||||
Build-Depends: qt5-graphicaleffects
|
||||
Description:
|
||||
|
||||
Feature: declarative
|
||||
Build-Depends: qt5-declarative
|
||||
Description:
|
||||
|
||||
Feature: imageformats
|
||||
Build-Depends: qt5-imageformats
|
||||
Description:
|
||||
|
||||
Feature: location
|
||||
Build-Depends: qt5-location
|
||||
Description:
|
||||
|
||||
Feature: multimedia
|
||||
Build-Depends: qt5-multimedia
|
||||
Description:
|
||||
|
||||
Feature: mqtt
|
||||
Build-Depends: qt5-mqtt
|
||||
Description:
|
||||
|
||||
Feature: webglplugin
|
||||
Build-Depends: qt5-webglplugin
|
||||
Description:
|
||||
|
||||
Feature: webview
|
||||
Build-Depends: qt5-webview
|
||||
Description:
|
||||
|
||||
Feature: wayland
|
||||
Build-Depends: qt5-wayland
|
||||
Description:
|
||||
|
||||
Feature: webengine
|
||||
Build-Depends: qt5-webengine
|
||||
Description:
|
||||
|
||||
Feature: serialbus
|
||||
Build-Depends: qt5-serialbus
|
||||
Description:
|
||||
|
||||
Feature: translations
|
||||
Build-Depends: qt5-translations
|
||||
Description:
|
||||
|
||||
Feature: doc
|
||||
Build-Depends: qt5-doc
|
||||
Description:
|
||||
|
||||
Feature: remoteobjects
|
||||
Build-Depends: qt5-remoteobjects
|
||||
Description:
|
||||
|
||||
Feature: connectivity
|
||||
Build-Depends: qt5-connectivity
|
||||
Description:
|
||||
|
||||
Feature: canvas3d
|
||||
Build-Depends: qt5-canvas3d
|
||||
Description: deprecated and removed in latest
|
||||
|
|
@ -1125,7 +1125,7 @@ mpir:arm64-windows=fail
|
|||
mpir:arm-uwp=fail
|
||||
mpir:x64-uwp=fail
|
||||
|
||||
#Conflicts with angle
|
||||
#Conflicts with angle and qt-5base
|
||||
ms-angle:arm64-windows = skip
|
||||
ms-angle:arm-uwp = skip
|
||||
ms-angle:x64-linux = skip
|
||||
|
|
@ -1327,9 +1327,6 @@ osgearth:x64-osx=fail
|
|||
osgearth:x64-linux=fail
|
||||
osgearth:x64-windows-static=fail
|
||||
osg-qt:x64-windows-static=fail
|
||||
# Missing Fontconfig linkage in vcpkg_cmake_wrapper. Will be fixed by #9860 with the removal of the wrapper.
|
||||
osg-qt:x64-osx=fail
|
||||
osg-qt:x64-linux=ignore
|
||||
otl:x64-windows=ignore
|
||||
otl:x64-windows-static=ignore
|
||||
otl:x64-uwp=ignore
|
||||
|
|
@ -1501,8 +1498,28 @@ qt5-macextras:x64-linux=fail
|
|||
qt5-macextras:x64-windows=fail
|
||||
qt5-macextras:x64-windows-static=fail
|
||||
qt5-macextras:x86-windows=fail
|
||||
# Missing system libraries
|
||||
qt5-wayland:x64-osx=fail
|
||||
# Missing libraries
|
||||
qt5-wayland:x86-windows=fail
|
||||
qt5-wayland:x64-windows=fail
|
||||
qt5-wayland:x64-windows-static=fail
|
||||
qt5-winextras:x64-linux=fail
|
||||
qt5-winextras:x64-osx=fail
|
||||
# Too big for CI.
|
||||
qt5-webengine:x64-windows=skip
|
||||
qt5-webengine:x86-windows=skip
|
||||
# Missing prerequisites for CI success
|
||||
qt5-webengine:x64-linux=fail
|
||||
qt5-webengine:x64-osx=fail
|
||||
# Static builds of qt5-webengine are not supported by the port itself
|
||||
qt5-webengine:x64-windows-static=skip
|
||||
# Missing system libraries
|
||||
qt5-x11extras:x64-osx=fail
|
||||
# Missing libraries
|
||||
qt5-x11extras:x86-windows=fail
|
||||
qt5-x11extras:x64-windows=fail
|
||||
qt5-x11extras:x64-windows-static=fail
|
||||
quickfast:x64-linux=ignore
|
||||
quickfix:x64-linux=ignore
|
||||
quickfix:x64-windows=ignore
|
||||
|
|
|
|||
Loading…
Reference in New Issue