diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-07-05 19:44:05 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2025-08-15 19:32:06 +0200 |
| commit | 3acd2d81d0c32d14644faefe51adbfac875b29f2 (patch) | |
| tree | 6f966529253bcc12ad82d2fafd9b80d60c3dec68 | |
| parent | 20f441000a4f44a2c6a677e0572332859d36d058 (diff) | |
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>
| -rw-r--r-- | cmake/QtCMakePackageVersionFile.cmake.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmake/QtCMakePackageVersionFile.cmake.in b/cmake/QtCMakePackageVersionFile.cmake.in index d4c30b33ac8..0e236901561 100644 --- a/cmake/QtCMakePackageVersionFile.cmake.in +++ b/cmake/QtCMakePackageVersionFile.cmake.in @@ -6,15 +6,15 @@ include("${CMAKE_CURRENT_LIST_DIR}/@package_name@ConfigVersionImpl.cmake") 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_code@ # 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) set(__qt_package_version_incompatible TRUE) else() |