mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 14:56:48 +08:00
36000a1085
* wip commit * refactor openssl ports. * fix issues due to the file movement * qt build succesful. * qtbase finished? * add qttools and qtdeclarative * add EntryPoints to fixup_cmake_targets * add todo * more config fixup * correct entrypoint and remove winmain * format manifest * fix module issues * add extra vars * make qtdeclarative work (x64-windows). -static has problems * some extra cleanup tools start building * refactor code to use common script across ports * remove patch applied twice * remove copy pasta * add remaining qt6 ports * fix a few details * fix the rest * format manifests * add features to qt5compat. * small modification to directories * copy plugins * a bit of cleanup * smaller fixes * format manifest * fix_linux_configure_issue * adding linux features. * dont use quotes around INSTALL_ vars to fix linux build * fix script install on linux * remove bin if empty on all platforms otherwise let vcpkg throw an error * fix syncqt path * fix assimp feature * try to figure you ci failures * fix manifest format * change the head ref to dev add three required upstream cmake patches allow single config builds * fix typo * switch to use FEATURE_ instead of QT_FEATURE * [ZSTD] Update to 1.4.5 * [zstd] fix wrong assert to fix uwp regressions * always install *.pc file. Correct -l flag in pc file * remove any changes to vcpkg_copy_tools * fix orc regression * fix arrow regressions * fix zstd target suffix * fix orc zstd linkage * fix find_package(ZSTD) * fix icu linkage in harfbuzz * install zstd dlls. * skip qt5-base in ci to test qtbase due to conflicts * fix the patch due to a replacement error * add a way for vcpkg_from_github to only download the source archive and return the archive file name. * update everything to beta4. maybe qtdeclarative:x64-windows-static works now? * remove outdated patches * Print the failed condition * more debug messages * fix condition patch * update to beta5 * update vcpkg_from_git to support tags and make output of ref possible. * update ports * add missing qt ports, fix qtbase build * regenerate docs * fix typo * fix imageformats webp * fix qtdeclarative static builds msvc * more fixes * make the rest of qt build succesfully. (only tested x64-windows) * format manifest. * [vcpkg_from_git] new options TAG and OUT_REF - TAG github tag to checkout - OUT_REF github commit id related to tag or ref (useable for automatic updates of ports if used with a version tag) * fix importprefix in qml plugin targets in static builds * fix static qttools build on windows * move qml plugin fix into qtbase * try fixing staqtic build issues. * make comment in qtquickcontrols2 * dont promote targets * fix missing limits include * fix patch * pass options in qtopcua * fix freetype linkage * fix freetype a bit different * fix promotion patch * fix freetype wrapper without " * fix typo in patch * enable build of qtopcua * format manifest for ci to run * retry promotion * try again but explicity not promote Threads::Threads * push patch * [fontconfig] add vcpkg cmake wrapper. * fix empty statement in the wrapper * show files in bin if any * Apply suggestions from code review Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * additional changes due to CR * regenerate docs * qdoc is build if llvm is present. * fix merge issues * fix wayland deps * add qt5-base to skip for static-md * format manifest. * update all qt ports. Lets see which patches need to be fixed/removed * fix some regressions by removing patches no longer necessary. (needs further cleanup to actually remove the patches) * fix qtopcua * make qttools build on osx * fix dependency of qttranslations * fix qtwayland * fix typo * fix case * adjust ci baseline for qtwayland on osx due to missing system libs. * create directory before rename * trying to make osx work * create the directory and move the files * move the removing outside the foreach .... * update to 6.0.2 * remove some outdated patches * qt 6.1.0-beta1 ci testing * remove unused patches * fix a few issues with qt 6.1.0-beta1 qtvirtualkeyboard needs some features. + need to install cmake wrappers from qtimageformats. + move QtAxServer to manual-link * Fix missing qt cmake wrappers for qttools and qtshadertools. * block qt beta ports in CI * turn off beta build in CI * remove outdated patches * skip qt6 beta ports in CI * [gettext] add feature tools. * switch hunspell to configure_make for pc files * switch to manifest * hunspell remove port debug and add comment about tools * setup qtvirtualkeyboard features. * fix manifest format CI * only run wayland on linux * disable pthread detection in gettext on windows * fix hunspell host dependency * formant manifest * - add qt6 prefix - add qt.conf.in - make qtbase depend on itself (host dependency) and see what breaks. * cannot add qt6 to bin folder currently. * try the prefix method - add tools-path to vcpkg_fixup_cmake_targets - add destination to vcpkg_copy_tools * feature refinement * fix tools issues * update baseline * more feature refinement. * be less noise in logs * update version in gettext format-manifest. * add version details * move on to qt version 6.0.3 * build cmake test port against qt6 * move qt5 includes into include/qt5 * ws change in cmake to force rebuild * version stuff * add plugin_config patch * version stuff * use upstream plugin patch for 6.1 * version stuff * update to qt 6.1.0-beta3 * add alignment patch * fix hunspell include path * make the patch depend on architecture * add qbittorrent as a test port * downgrade qbittorrent a bit so that in can run in CI * remove bin in static builds * remove debug folder completly (since it is empty) * copy additional deps required by qtshadertools and qtdeclarative in qtbase to avoid issues with binary chaching. * fix logic * try upstream alignment patch * update baseline * add feature options to qt5compat * update to qt 6.1.0 * version stuff * fix qt.conf (for release builds only) * fix install of missing FindX modules in qtimageformats which where supposed to be fixed upstream but aren't * remove unnecessary patch * version stuff * fix some qt.conf stuff * install some wrappers for debug builds. * fine tuning qt.conf * fix debug windeployqt install but somebody is linking release icudt in debug * fix arm crossbuilds on windows * remove tools default line * version stuff * add missing host dependencies. * fix windeploy target correctly for debug * fix cmake arm builds. * some batch improvements * run qmake.debug.bat for debug builds. * version stuff * unconditionally include the patch in qtvirtualkeyboard * version stuff * more host dependencies * version stuff * more host deps * version stuff * fix qtactiveqt * version stuff * suppress batch skript output * version stuff * Apply CR changes * version stuff * newline attack * update qbittorrent test port and newline... * version stuff again * switch to version-semver * version stuff * remove qbittorrent test_port because - easier than rewriting history - qt6svg usage will probably be tested by paraview/vtk in the future Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
81 lines
3.4 KiB
CMake
81 lines
3.4 KiB
CMake
set(QT_VERSION 6.1.0-beta3)
|
|
set(QT_GIT_TAG v${QT_VERSION})
|
|
#set(QT_UPDATE_VERSION TRUE)
|
|
set(QT_IS_LATEST 1)
|
|
# List of added an removed modules https://doc-snapshots.qt.io/qt6-dev/whatsnew60.html#changes-to-supported-modules
|
|
#https://wiki.qt.io/Get_the_Source
|
|
#TODO:qtknx?
|
|
|
|
set(QT_PORTS qtbase
|
|
qttools
|
|
qtdeclarative
|
|
qtsvg
|
|
qt5compat
|
|
qtshadertools
|
|
qtquicktimeline
|
|
qtquick3d
|
|
qttranslations
|
|
qtwayland
|
|
qtdoc
|
|
qtcoap
|
|
qtopcua
|
|
qtimageformats
|
|
qtmqtt
|
|
qtnetworkauth
|
|
qtquickcontrols2
|
|
###
|
|
qtactiveqt
|
|
qtdatavis3d
|
|
#qtdeviceutils
|
|
qtlottie
|
|
qtscxml
|
|
qtvirtualkeyboard
|
|
qtcharts
|
|
)
|
|
# New: qtactiveqt qtdatavis3d qtlottie qtscxml qtvirtualkeyboard qtcharts
|
|
|
|
foreach(_port IN LISTS QT_PORTS)
|
|
set(${_port}_TAG ${QT_GIT_TAG})
|
|
endforeach()
|
|
|
|
set(qtbase_REF 089b73de033190e511c0bd11cba22160024ef9a4)
|
|
set(qttools_REF a810532b7f68348281bac13fc03395bf08827c28)
|
|
set(qtdeclarative_REF 1e4730ae0f44ece8ff8a27d4de127d8da9ed8a13)
|
|
set(qtsvg_REF 1adf841f16cab093f7db6a1fbffd088b138afed3)
|
|
set(qt5compat_REF 6ab304e8d2fe7f58cf608f8a30abbf769680f027)
|
|
set(qtshadertools_REF c26caefc6f67f01ae52372a70d3887077477388d)
|
|
set(qtquicktimeline_REF a91e82010047c9422d573b4c8648c175b470839e)
|
|
set(qtquick3d_REF f6614a31bd8a092d2081092dc7043ead9e7475ea)
|
|
set(qttranslations_REF 8a39fca4b56817fa2f7393fd5c5850bb167ac8f3)
|
|
set(qtwayland_REF 8237b7384537e3bc1687c1e05a20d450a6ed38f3)
|
|
set(qtdoc_REF 9259552281e4322a63f2cd0edce7904af1147bca)
|
|
set(qtimageformats_REF acd9ad1f69606553bc975fb33ae4efd52b2fbe9f)
|
|
set(qtmqtt_REF 3bdd419302de7e1e8a819509d115c32d2fbf4d49)
|
|
set(qtquickcontrols2_REF a74819563efc3495a86a696e678bec11bab33ec6)
|
|
set(qtnetworkauth_REF 92a1ff5b63f56e77030cdfbe9c456a31d3a2d5e2)
|
|
set(qtcoap_REF bc8f5ff0e678aa4b4c9081e543fd7c119754a3a1)
|
|
set(qtopcua_REF 0cd72d5e9cfaaf96b6d9a2d4ce4a6c46ffbbcdd4)
|
|
###
|
|
set(qtactiveqt_REF 94a100baa75248ba49c01680ca3632cd7180a8e8)
|
|
set(qtdatavis3d_REF c1e7a47f47cc289652f2004403cb1e587308c290)
|
|
#set(qtdeviceutils_REF 0) #missing tag
|
|
set(qtlottie_REF ddda33a7294512487035de6338a91657501c9fd2)
|
|
set(qtscxml_REF 8e2ad5c798110337b90c582c68e903465e19e3fe)
|
|
set(qtvirtualkeyboard_REF 266626a0414aef2fcc65d412f02c993c87a1cae6)
|
|
set(qtcharts_REF 962a05cea44108d13f081a12bd53232ef856427c)
|
|
|
|
if(QT_UPDATE_VERSION)
|
|
message(STATUS "Running Qt in automatic version port update mode!")
|
|
set(_VCPKG_INTERNAL_NO_HASH_CHECK 1)
|
|
if("${PORT}" MATCHES "qtbase")
|
|
file(REMOVE "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_new_refs.cmake")
|
|
foreach(_current_qt_port IN LISTS QT_PORTS)
|
|
set(_current_control "${VCPKG_ROOT_DIR}/ports/${_current_qt_port}/vcpkg.json")
|
|
file(READ "${_current_control}" _control_contents)
|
|
string(REGEX REPLACE "\"version-string\": [^\n]+\n" "\"version-string\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}")
|
|
file(WRITE "${_current_control}" "${_control_contents}")
|
|
#need to run a vcpkg format-manifest --all after update once
|
|
endforeach()
|
|
endif()
|
|
endif()
|