diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-09-17 19:21:45 +1000 |
|---|---|---|
| committer | Craig Scott <craig.scott@qt.io> | 2021-09-18 01:54:08 +1000 |
| commit | c780708bd3ad58f1aade92df9c0cee7adcbd46f3 (patch) | |
| tree | d4e25b2ff703307362a187c5d1cd4e4fc30a8c02 | |
| parent | 7a4b586f4b8d1b73d1af3d24ff5112e4dc231ea6 (diff) | |
Remove TODOs related to checking CMake 3.21 features post-release
These TODOs were left as a marker to be checked once the official
CMake 3.21.0 release was made. The things they refer to were included
in the CMake 3.21.0 release, so the TODOs can be removed.
Fixes: QTBUG-94528
Pick-to: 6.2
Change-Id: I769605de85df657ad056123e787ec9849b77e42f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtPublicTargetHelpers.cmake | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index d46917f1a7..4bd0d745cc 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -1001,8 +1001,6 @@ function(qt_internal_static_link_order_test) # linker line, it's expected that all object files are located at the beginning of the linker # line. # No need to run the test. - # TODO: This check is added before the actual release of CMake 3.21. So need to check if the - # target version meets the expectations. if(CMAKE_VERSION VERSION_LESS 3.21) __qt_internal_check_link_order_matters(link_order_matters) if(link_order_matters) diff --git a/cmake/QtPublicTargetHelpers.cmake b/cmake/QtPublicTargetHelpers.cmake index 571173e8aa..8f6c434c4e 100644 --- a/cmake/QtPublicTargetHelpers.cmake +++ b/cmake/QtPublicTargetHelpers.cmake @@ -124,8 +124,6 @@ function(__qt_internal_process_dependency_object_libraries target) # line. # So circular dependencies between static libraries and object files are resolved and no need # to call the finalizer code. - # TODO: This check is added before the actual release of CMake 3.21. So need to confirm that the - # target version meets the expectations. if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.21) return() endif() |