qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: Allow flexible overriding of QT_NO_PACKAGE_VERSION_CHECK 

In developer builds we allow mixing of package versions.
However there was no way to bail out from this behavior as
@extra_code@ always overrides the setting.

Move QT_NO_PACKAGE_VERSION_CHECK after the @extra_code@ so that
the behavior is configurable.

Pick-to: 6.8 6.9 6.10
Task-number: QTBUG-103500
Change-Id: Ie64376b86aa02ad6550d78819f4eaf239064ca61
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Michal Klocek 2022-07-05 19:44:05 +02:00 committed by Alexandru Croitor
parent 20f441000a
commit 3acd2d81d0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/QtCMakePackageVersionFile.cmake.in
View File

@ -6,15 +6,15 @@ include("${CMAKE_CURRENT_LIST_DIR}/@package_name@ConfigVersionImpl.cmake")
set(__qt_disable_package_version_check FALSE) set(__qt_disable_package_version_check FALSE)
# Allow to opt out of the version check.
if(QT_NO_PACKAGE_VERSION_CHECK)
set(__qt_disable_package_version_check TRUE)
endif()
# Extra CMake code begin # Extra CMake code begin
@extra_code@ @extra_code@
# Extra CMake code end # Extra CMake code end
# Allow to opt out of the version check.
if(DEFINED QT_NO_PACKAGE_VERSION_CHECK)
set(__qt_disable_package_version_check ${QT_NO_PACKAGE_VERSION_CHECK})
endif()
if((NOT PACKAGE_VERSION_COMPATIBLE) OR PACKAGE_VERSION_UNSUITABLE) if((NOT PACKAGE_VERSION_COMPATIBLE) OR PACKAGE_VERSION_UNSUITABLE)
set(__qt_package_version_incompatible TRUE) set(__qt_package_version_incompatible TRUE)
else() else()