vcpkg/ports/qtbase/portfile.cmake

355 lines
14 KiB
CMake
Raw Normal View History

[Qt6|6.1.0] Add new ports. (#14333) * 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>
2021-06-02 02:05:59 +08:00
set(QT_IS_LATEST OFF)
## All above goes into the qt_port_hashes in the future
include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake")
set(${PORT}_PATCHES
jpeg.patch
harfbuzz.patch
config_install.patch
allow_outside_prefix.patch
buildcmake.patch
dont_force_cmakecache.patch
fix_find_dep.patch
20b3eb0.diff # Upstream fix to build with clang-cl; didn't make 6.1.1 so I backported the patch.
clang-cl_source_location.patch
[Qt6|6.1.0] Add new ports. (#14333) * 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>
2021-06-02 02:05:59 +08:00
)
if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST)
list(APPEND ${PORT}_PATCHES
)
endif()
if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES)
message(FATAL_ERROR "${PORT} requires feature doubleconversion on windows!" )
endif()
# Features can be found via searching for qt_feature in all configure.cmake files in the source:
# The files also contain information about the Platform for which it is searched
# Always use FEATURE_<feature> in vcpkg_configure_cmake
# (using QT_FEATURE_X overrides Qts condition check for the feature.)
# Theoretically there is a feature for every widget to enable/disable it but that is way to much for vcpkg
set(input_vars doubleconversion freetype harfbuzz libb2 jpeg libmd4c png sql-sqlite)
set(INPUT_OPTIONS)
foreach(_input IN LISTS input_vars)
if(_input MATCHES "(png|jpeg)" )
list(APPEND INPUT_OPTIONS -DINPUT_lib${_input}:STRING=)
elseif(_input MATCHES "(sql-sqlite)")
list(APPEND INPUT_OPTIONS -DINPUT_sqlite:STRING=) # Not yet used be the cmake build
else()
list(APPEND INPUT_OPTIONS -DINPUT_${_input}:STRING=)
endif()
if("${_input}" IN_LIST FEATURES)
string(APPEND INPUT_OPTIONS system)
elseif(_input STREQUAL "libb2" AND NOT VCPKG_TARGET_IS_WINDOWS)
string(APPEND INPUT_OPTIONS system)
elseif(_input STREQUAL "libmd4c")
string(APPEND INPUT_OPTIONS qt) # libmd4c is not yet in VCPKG (but required by qtdeclarative)
else()
string(APPEND INPUT_OPTIONS no)
endif()
endforeach()
# General features:
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"appstore-compliant" FEATURE_appstore-compliant
"zstd" FEATURE_zstd
"framework" FEATURE_framework
"concurrent" FEATURE_concurrent
"dbus" FEATURE_dbus
"gui" FEATURE_gui
"network" FEATURE_network
"sql" FEATURE_sql
"widgets" FEATURE_widgets
#"xml" FEATURE_xml # Required to build moc
"testlib" FEATURE_testlib
INVERTED_FEATURES
"zstd" CMAKE_DISABLE_FIND_PACKAGE_ZSTD
"dbus" CMAKE_DISABLE_FIND_PACKAGE_WrapDBus1
)
list(APPEND FEATURE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libudev:BOOL=ON)
list(APPEND FEATURE_OPTIONS -DFEATURE_xml:BOOL=ON)
# Corelib features:
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_CORE_OPTIONS
FEATURES
"doubleconversion" FEATURE_doubleconversion
"glib" FEATURE_glib
"icu" FEATURE_icu
"pcre2" FEATURE_pcre2
INVERTED_FEATURES
#"doubleconversion" CMAKE_DISABLE_FIND_PACKAGE_WrapDoubleConversion # Required
"icu" CMAKE_DISABLE_FIND_PACKAGE_ICU
#"pcre2" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemPCRE2 # Bug in qt cannot be deactivated
"glib" CMAKE_DISABLE_FIND_PACKAGE_GLIB2
)
#list(APPEND FEATURE_CORE_OPTIONS -DFEATURE_doubleconversion:BOOL=ON)
list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_LTTngUST:BOOL=ON)
list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_PPS:BOOL=ON)
list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Slog2:BOOL=ON)
list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libsystemd:BOOL=ON)
# Network features:
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_NET_OPTIONS
FEATURES
"openssl" FEATURE_openssl
"brotli" FEATURE_brotli
INVERTED_FEATURES
"brotli" CMAKE_DISABLE_FIND_PACKAGE_WrapBrotli
"openssl" CMAKE_DISABLE_FIND_PACKAGE_WrapOpenSSL
)
if("openssl" IN_LIST FEATURES)
list(APPEND FEATURE_NET_OPTIONS -DINPUT_openssl=linked)
else()
list(APPEND FEATURE_NET_OPTIONS -DINPUT_openssl=no)
endif()
list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libproxy:BOOL=ON)
list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI:BOOL=ON)
# Gui features:
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
FEATURES
"freetype" FEATURE_freetype # required on windows
"harfbuzz" FEATURE_harfbuzz
"fontconfig" FEATURE_fontconfig # NOT WINDOWS
"jpeg" FEATURE_jpeg
"png" FEATURE_png
#"opengl" INPUT_opengl=something
INVERTED_FEATURES
"vulkan" CMAKE_DISABLE_FIND_PACKAGE_Vulkan
"egl" CMAKE_DISABLE_FIND_PACKAGE_EGL
"fontconfig" CMAKE_DISABLE_FIND_PACKAGE_Fontconfig
#"freetype" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemFreetype # Bug in qt cannot be deactivated
"harfbuzz" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemHarfbuzz
"jpeg" CMAKE_DISABLE_FIND_PACKAGE_JPEG
"png" CMAKE_DISABLE_FIND_PACKAGE_PNG
"xlib" CMAKE_DISABLE_FIND_PACKAGE_X11
"xkb" CMAKE_DISABLE_FIND_PACKAGE_XKB
"xcb" CMAKE_DISABLE_FIND_PACKAGE_XCB
"xcb-xlib" CMAKE_DISABLE_FIND_PACKAGE_X11_XCB
"xkbcommon-x11" CMAKE_DISABLE_FIND_PACKAGE_XKB_COMMON_X11
"xrender" CMAKE_DISABLE_FIND_PACKAGE_XRender
# There are more X features but I am unsure how to safely disable them! Most of them seem to be found automaticall with find_package(X11)
)
if("xcb" IN_LIST FEATURES)
list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xcb=yes)
else()
list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xcb=no)
endif()
if("xkb" IN_LIST FEATURES)
list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xkbcommon=yes)
else()
list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xkbcommon=no)
endif()
list(APPEND FEATURE_GUI_OPTIONS )
list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_ATSPI2:BOOL=ON)
list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_DirectFB:BOOL=ON)
list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libdrm:BOOL=ON)
list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_gbm:BOOL=ON)
list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libinput:BOOL=ON)
list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Mtdev:BOOL=ON)
list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GLESv2:BOOL=ON) # only used if INPUT_opengl is correctly set
list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Tslib:BOOL=ON)
# sql-drivers features:
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_SQLDRIVERS_OPTIONS
FEATURES
"sql-sqlite" FEATURE_system_sqlite
INVERTED_FEATURES
"sql-psql" CMAKE_DISABLE_FIND_PACKAGE_PostgreSQL
"sql-sqlite" CMAKE_DISABLE_FIND_PACKAGE_SQLite3
# "sql-db2" FEATURE_sql-db2
# "sql-ibase" FEATURE_sql-ibase
# "sql-mysql" FEATURE_sql-mysql
# "sql-oci" FEATURE_sql-oci
# "sql-odbc" FEATURE_sql-odbc
)
set(DB_LIST DB2 MySQL Oracle ODBC)
foreach(_db IN LISTS DB_LIST)
list(APPEND FEATURE_SQLDRIVERS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_${_db}:BOOL=ON)
endforeach()
# printsupport features:
# vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_PRINTSUPPORT_OPTIONS
# )
list(APPEND FEATURE_PRINTSUPPORT_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_CUPS:BOOL=ON)
# widgets features:
# vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_WIDGETS_OPTIONS
# "gtk3" FEATURE_gtk3
# There are a lot of additional features here to deactivate parts of widgets.
# )
list(APPEND FEATURE_WIDGETS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GTK3:BOOL=ON)
set(TOOL_NAMES
androiddeployqt
androidtestrunner
cmake_automoc_parser
moc
qdbuscpp2xml
qdbusxml2cpp
qlalr
qmake
qmake6
qvkgen
rcc
tracegen
uic
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS
#--trace-expand
${FEATURE_OPTIONS}
${FEATURE_CORE_OPTIONS}
${FEATURE_NET_OPTIONS}
${FEATURE_GUI_OPTIONS}
${FEATURE_SQLDRIVERS_OPTIONS}
${FEATURE_PRINTSUPPORT_OPTIONS}
${FEATURE_WIDGETS_OPTIONS}
${INPUT_OPTIONS}
-DQT_USE_BUNDLED_BundledFreetype:BOOL=FALSE
-DQT_USE_BUNDLED_BundledHarfbuzz:BOOL=FALSE
-DQT_USE_BUNDLED_BundledLibpng:BOOL=FALSE
-DQT_USE_BUNDLED_BundledPcre2:BOOL=FALSE
-DINPUT_bundled_xcb_xinput:STRING=no
-DFEATURE_force_debug_info:BOOL=ON
-DFEATURE_relocatable:BOOL=ON
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
-DQT_NO_MAKE_TOOLS:BOOL=ON
-DFEATURE_debug:BOOL=ON
)
# Install CMake helper scripts
if(QT_IS_LATEST)
set(port_details "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_details-latest.cmake")
else()
set(port_details "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_details.cmake")
endif()
file(INSTALL
"${port_details}"
DESTINATION
"${CURRENT_PACKAGES_DIR}/share/${PORT}"
RENAME
"qt_port_details.cmake"
)
file(COPY
"${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_copyright.cmake"
"${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake"
DESTINATION
"${CURRENT_PACKAGES_DIR}/share/${PORT}"
)
qt_stop_on_update()
set(script_files qt-cmake qt-cmake-private qt-cmake-standalone-test qt-configure-module qt-internal-configure-tests)
if(VCPKG_TARGET_IS_WINDOWS)
set(script_suffix .bat)
else()
set(script_suffix)
endif()
set(other_files
qt-cmake-private-install.cmake
syncqt.pl
android_cmakelist_patcher.sh
android_emulator_launcher.sh
ensure_pro_file.cmake
)
foreach(_config debug release)
if(_config MATCHES "debug")
set(path_suffix debug/)
else()
set(path_suffix)
endif()
if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin")
continue()
endif()
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}")
[Qt6|6.1.0] Add new ports. (#14333) * 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>
2021-06-02 02:05:59 +08:00
foreach(script IN LISTS script_files)
if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${script}${script_suffix}")
set(target_script "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${script}${script_suffix}")
[Qt6|6.1.0] Add new ports. (#14333) * 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>
2021-06-02 02:05:59 +08:00
file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${script}${script_suffix}" "${target_script}")
file(READ "${target_script}" _contents)
if(_config MATCHES "debug")
string(REPLACE "\\..\\share\\" "\\..\\..\\..\\..\\share\\" _contents "${_contents}")
else()
string(REPLACE "\\..\\share\\" "\\..\\..\\..\\share\\" _contents "${_contents}")
endif()
file(WRITE "${target_script}" "${_contents}")
endif()
endforeach()
foreach(other IN LISTS other_files)
if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other}")
file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${other}")
[Qt6|6.1.0] Add new ports. (#14333) * 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>
2021-06-02 02:05:59 +08:00
endif()
endforeach()
endforeach()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(GLOB_RECURSE _bin_files "${CURRENT_PACKAGES_DIR}/bin/*")
if(NOT _bin_files) # Only clean if empty otherwise let vcpkg throw and error.
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/")
endif()
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/QtBuildInternals")
if(NOT VCPKG_TARGET_IS_OSX)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/macos")
endif()
if(NOT VCPKG_TARGET_IS_IOS)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/ios")
endif()
[Qt6|6.1.0] Add new ports. (#14333) * 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>
2021-06-02 02:05:59 +08:00
set(_file "${CMAKE_CURRENT_LIST_DIR}/qt.conf.in")
set(REL_PATH)
configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_release.conf" @ONLY)
[Qt6|6.1.0] Add new ports. (#14333) * 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>
2021-06-02 02:05:59 +08:00
set(BACKUP_CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}")
set(BACKUP_CURRENT_HOST_INSTALLED_DIR "${CURRENT_HOST_INSTALLED_DIR}")
set(CURRENT_INSTALLED_DIR "./../../../")
set(CURRENT_HOST_INSTALLED_DIR "./../../../")
configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.conf")
[Qt6|6.1.0] Add new ports. (#14333) * 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>
2021-06-02 02:05:59 +08:00
set(REL_PATH debug/)
configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.debug.conf")
[Qt6|6.1.0] Add new ports. (#14333) * 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>
2021-06-02 02:05:59 +08:00
set(CURRENT_INSTALLED_DIR "${BACKUP_CURRENT_INSTALLED_DIR}")
set(CURRENT_HOST_INSTALLED_DIR "${BACKUP_CURRENT_HOST_INSTALLED_DIR}")
configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_debug.conf" @ONLY)
[Qt6|6.1.0] Add new ports. (#14333) * 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>
2021-06-02 02:05:59 +08:00
if(VCPKG_TARGET_IS_WINDOWS)
set(_DLL_FILES brotlicommon brotlidec bz2 freetype harfbuzz libpng16)
set(DLLS_TO_COPY)
foreach(_file IN LISTS _DLL_FILES)
if(EXISTS "${CURRENT_INSTALLED_DIR}/bin/${_file}.dll")
list(APPEND DLLS_TO_COPY "${CURRENT_INSTALLED_DIR}/bin/${_file}.dll")
endif()
endforeach()
file(COPY ${DLLS_TO_COPY} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin")
[Qt6|6.1.0] Add new ports. (#14333) * 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>
2021-06-02 02:05:59 +08:00
endif()
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qmake.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin")
[Qt6|6.1.0] Add new ports. (#14333) * 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>
2021-06-02 02:05:59 +08:00
set(hostinfofile "${CURRENT_PACKAGES_DIR}/share/Qt6HostInfo/Qt6HostInfoConfig.cmake")
file(READ "${hostinfofile}" _contents)
string(REPLACE [[set(QT6_HOST_INFO_LIBEXECDIR "bin")]] [[set(QT6_HOST_INFO_LIBEXECDIR "tools/Qt6/bin")]] _contents "${_contents}")
string(REPLACE [[set(QT6_HOST_INFO_BINDIR "bin")]] [[set(QT6_HOST_INFO_BINDIR "tools/Qt6/bin")]] _contents "${_contents}")
[Qt6|6.1.0] Add new ports. (#14333) * 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>
2021-06-02 02:05:59 +08:00
file(WRITE "${hostinfofile}" "${_contents}")
set(coretools "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreTools.cmake")
if(EXISTS "${coretools}")
file(READ "${coretools}" _contents)
string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.exe"]] [["${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.debug.bat"]] _contents "${_contents}")
[Qt6|6.1.0] Add new ports. (#14333) * 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>
2021-06-02 02:05:59 +08:00
file(WRITE "${coretools}" "${_contents}")
endif()