1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove TODOs related to checking CMake 3.21 features post-release

Browse Source 
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>
This commit is contained in:
Craig Scott 2021-09-17 19:21:45 +10:00
parent 7a4b586f4b
commit c780708bd3
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
View File

@ -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 # linker line, it's expected that all object files are located at the beginning of the linker
# line. # line.
# No need to run the test. # 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) if(CMAKE_VERSION VERSION_LESS 3.21)
__qt_internal_check_link_order_matters(link_order_matters) __qt_internal_check_link_order_matters(link_order_matters)
if(link_order_matters) if(link_order_matters)

2
cmake/QtPublicTargetHelpers.cmake
View File

@ -124,8 +124,6 @@ function(__qt_internal_process_dependency_object_libraries target)
# line. # line.
# So circular dependencies between static libraries and object files are resolved and no need # So circular dependencies between static libraries and object files are resolved and no need
# to call the finalizer code. # 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) if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.21)
return() return()
endif() endif()