diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-11 15:46:31 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-12 14:19:34 +0000 |
| commit | 6732fa3a291e77acad3ab6ba829d1026462dc139 (patch) | |
| tree | eae7522ffebf148907ff58421ea4681e7726f99a /cmake/QtBuild.cmake | |
| parent | 82840d2660202c6d8f3c53ad1d620667901cb954 (diff) | |
Fix linking of examples
Provide add_qt_gui_executable() as function in our public API that takes
care of automaticWinMain linkage. We can use this in the future to
encapsulate similarplatform-specific behavior and adjustments, such as
module generation onAndroid.
In order for the examples to see the function in Qt5CoreMacros, three more
additional fixes were required:
* Do the build_repo_end() call _before_ attempting to build the
examples, as we need the build_repo_end() to include QtPostProcess
and complete the creation of all the target config files.
Otherwise the find_package() calls in the examples see something
incomplete.
* Add more QT_NO_CREATE_TARGET guards
* Always call find_dependency on the dependencies, regardless of the
target creation mode. This way a find_package(Qt5 COMPONENTS
Widgets) will still load Qt5CoreMacros.
Change-Id: I03ce856e2f4312a050fe8043b8331cbe8a6c93e6
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtBuild.cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index c0436866af..67c80ab2d6 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1349,9 +1349,11 @@ function(qt_export_tools module_name) set(tool_targets "") foreach(tool_name ${QT_KNOWN_MODULE_${module_name}_TOOLS}) set(extra_cmake_statements "${extra_cmake_statements} -get_property(is_global TARGET ${INSTALL_CMAKE_NAMESPACE}::${tool_name} PROPERTY IMPORTED_GLOBAL) -if(NOT is_global) - set_property(TARGET ${INSTALL_CMAKE_NAMESPACE}::${tool_name} PROPERTY IMPORTED_GLOBAL TRUE) +if (NOT QT_NO_CREATE_TARGETS) + get_property(is_global TARGET ${INSTALL_CMAKE_NAMESPACE}::${tool_name} PROPERTY IMPORTED_GLOBAL) + if(NOT is_global) + set_property(TARGET ${INSTALL_CMAKE_NAMESPACE}::${tool_name} PROPERTY IMPORTED_GLOBAL TRUE) + endif() endif() ") list(APPEND tool_targets "${QT_CMAKE_EXPORT_NAMESPACE}::${tool_name}") |