mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 04:39:00 +08:00
147027390b
* [Qt6] update to 6.2.4
* adjust patches
* more fixes
* more CMAKE_REQUIRE_FIND_PACKAGE
* fix configure?
* cannot require cmake not config stuff.
* more REQUIRE removals
* adjust required stuff
* more modules.
* less require stuff
* disable env patch for now and silent the require maybe unused. warnings
* different approach
* fix case ?
* fix linux builds
* more stuff to not force in vcpkg
* reenable env patch
* only use env patch on windows.
* reenable qtwebengine. Maybe the ICE was fixed?
* Revert "reenable qtwebengine. Maybe the ICE was fixed?"
This reverts commit 5dc3ca88c1
.
* version stuff
Co-authored-by: Alexander Neumann <you@example.com>
36 lines
1.4 KiB
CMake
36 lines
1.4 KiB
CMake
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
|
|
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
|
|
|
|
set(${PORT}_PATCHES)
|
|
|
|
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
|
FEATURES
|
|
"textcodec" FEATURE_textcodec
|
|
"codecs" FEATURE_codecs
|
|
"big-codecs" FEATURE_big_codecs
|
|
"iconv" FEATURE_iconv
|
|
"iconv" CMAKE_DISABLE_FIND_PACKAGE_ICU
|
|
#"iconv" CMAKE_REQUIRE_FIND_PACKAGE_WrapIconv
|
|
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
|
|
INVERTED_FEATURES
|
|
"iconv" CMAKE_DISABLE_FIND_PACKAGE_WrapIconv
|
|
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
|
|
)
|
|
|
|
#For iconv feature to work the following must be true:
|
|
#CONDITION NOT FEATURE_icu AND FEATURE_textcodec AND NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND WrapIconv_FOUND
|
|
#TODO: check if qtbase was built with ICU and fail if iconv is given here.
|
|
|
|
set(TOOL_NAMES)
|
|
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
|
|
TOOL_NAMES ${TOOL_NAMES}
|
|
CONFIGURE_OPTIONS
|
|
${FEATURE_OPTIONS}
|
|
CONFIGURE_OPTIONS_RELEASE
|
|
CONFIGURE_OPTIONS_DEBUG
|
|
)
|
|
|
|
#For my documentation:
|
|
# find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
|
|
# find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Network Xml Gui Quick)
|