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

CMake: Add public FindPackageHelpers

Browse Source 
This makes qt_internal_disable_find_package_global_promotion available,
which is needed when linking against QtMultimedia in a static build

Change-Id: I9b8f6d7b74a8693ac471f8a280e893f4da80a44b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit f380c87731472eb59495b7823b7c6243b3aa11f4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Dominik Holland 2021-06-14 16:24:57 +02:00 committed by Qt Cherry-pick Bot
parent 130fe73979
commit 4151d5869a
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/QtBaseGlobalTargets.cmake
View File

@ -255,6 +255,7 @@ set(__public_cmake_helpers
cmake/QtPublicPluginHelpers.cmake cmake/QtPublicPluginHelpers.cmake
cmake/QtPublicTargetHelpers.cmake cmake/QtPublicTargetHelpers.cmake
cmake/QtPublicWalkLibsHelpers.cmake cmake/QtPublicWalkLibsHelpers.cmake
cmake/QtPublicFindPackageHelpers.cmake
) )
qt_copy_or_install(FILES ${__public_cmake_helpers} DESTINATION "${__GlobalConfig_install_dir}") qt_copy_or_install(FILES ${__public_cmake_helpers} DESTINATION "${__GlobalConfig_install_dir}")

1
cmake/QtBuild.cmake
View File

@ -551,6 +551,7 @@ endif()
include(QtPublicPluginHelpers) include(QtPublicPluginHelpers)
include(QtPublicTargetHelpers) include(QtPublicTargetHelpers)
include(QtPublicWalkLibsHelpers) include(QtPublicWalkLibsHelpers)
include(QtPublicFindPackageHelpers)
# TODO: This block provides support for old variables. It should be removed once # TODO: This block provides support for old variables. It should be removed once

1
cmake/QtConfig.cmake.in
View File

@ -59,6 +59,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/QtPublicFinalizerHelpers.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/QtPublicPluginHelpers.cmake") include("${CMAKE_CURRENT_LIST_DIR}/QtPublicPluginHelpers.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/QtPublicTargetHelpers.cmake") include("${CMAKE_CURRENT_LIST_DIR}/QtPublicTargetHelpers.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/QtPublicWalkLibsHelpers.cmake") include("${CMAKE_CURRENT_LIST_DIR}/QtPublicWalkLibsHelpers.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/QtPublicFindPackageHelpers.cmake")
# Find required dependencies, if any. # Find required dependencies, if any.
include(CMakeFindDependencyMacro) include(CMakeFindDependencyMacro)

4
cmake/QtFindPackageHelpers.cmake
View File

@ -299,7 +299,3 @@ function(qt_internal_should_not_promote_package_target_to_global target out_var)
get_property(should_not_promote TARGET "${target}" PROPERTY _qt_no_promote_global) get_property(should_not_promote TARGET "${target}" PROPERTY _qt_no_promote_global)
set("${out_var}" "${should_not_promote}" PARENT_SCOPE) set("${out_var}" "${should_not_promote}" PARENT_SCOPE)
endfunction() endfunction()
function(qt_internal_disable_find_package_global_promotion target)
set_target_properties("${target}" PROPERTIES _qt_no_promote_global TRUE)
endfunction()

3
cmake/QtPublicFindPackageHelpers.cmake Normal file
View File

@ -0,0 +1,3 @@
function(qt_internal_disable_find_package_global_promotion target)
set_target_properties("${target}" PROPERTIES _qt_no_promote_global TRUE)
endfunction()