Fix qt incorrectly detecting an android build on non-android targets. (#27619)

Probably introduced in https://github.com/microsoft/vcpkg/pull/27421 , shows up as a baseline issue in https://github.com/microsoft/vcpkg/pull/27598/
This commit is contained in:
Billy O'Neal 2022-11-03 14:12:05 -07:00 committed by GitHub
parent 49931943ab
commit 11afcc7e8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 14 deletions

View File

@ -105,6 +105,10 @@ function(qt_cmake_configure)
list(APPEND _qarg_OPTIONS "-DQT_NO_FORCE_SET_CMAKE_BUILD_TYPE:BOOL=ON")
if(VCPKG_TARGET_IS_ANDROID)
list(APPEND _qarg_OPTIONS "-DANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}")
endif()
if(NOT PORT MATCHES "qtbase")
list(APPEND _qarg_OPTIONS "-DQT_MKSPECS_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6/mkspecs")
endif()
@ -127,7 +131,6 @@ function(qt_cmake_configure)
-DINSTALL_LIBEXECDIR:STRING=bin
-DINSTALL_PLUGINSDIR:STRING=${qt_plugindir}
-DINSTALL_QMLDIR:STRING=${qt_qmldir}
-DANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}
${_qarg_OPTIONS}
OPTIONS_RELEASE
${_qarg_OPTIONS_RELEASE}

View File

@ -1,7 +1,7 @@
{
"name": "qtbase",
"version": "6.3.2",
"port-version": 2,
"port-version": 3,
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -6218,7 +6218,7 @@
},
"qtbase": {
"baseline": "6.3.2",
"port-version": 2
"port-version": 3
},
"qtcharts": {
"baseline": "6.3.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e279c6fed17e9d572a061c482ee73906ffd3e54e",
"version": "6.3.2",
"port-version": 3
},
{
"git-tree": "fdd5dc4e0a94cae2b27acd08ea0c4a7453a6519d",
"version": "6.3.2",