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 /examples/widgets/dialogs | |
| 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 'examples/widgets/dialogs')
7 files changed, 7 insertions, 7 deletions
diff --git a/examples/widgets/dialogs/classwizard/CMakeLists.txt b/examples/widgets/dialogs/classwizard/CMakeLists.txt index 1c9ecebcee..5a57c5905a 100644 --- a/examples/widgets/dialogs/classwizard/CMakeLists.txt +++ b/examples/widgets/dialogs/classwizard/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(classwizard WIN32 MACOSX_BUNDLE +add_qt_gui_executable(classwizard WIN32 MACOSX_BUNDLE classwizard.cpp classwizard.h classwizard.qrc main.cpp ) diff --git a/examples/widgets/dialogs/extension/CMakeLists.txt b/examples/widgets/dialogs/extension/CMakeLists.txt index 8037d670d9..fa35d52048 100644 --- a/examples/widgets/dialogs/extension/CMakeLists.txt +++ b/examples/widgets/dialogs/extension/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(extension WIN32 MACOSX_BUNDLE +add_qt_gui_executable(extension WIN32 MACOSX_BUNDLE finddialog.cpp finddialog.h main.cpp ) diff --git a/examples/widgets/dialogs/findfiles/CMakeLists.txt b/examples/widgets/dialogs/findfiles/CMakeLists.txt index 11e971b7f2..12ce6ce05e 100644 --- a/examples/widgets/dialogs/findfiles/CMakeLists.txt +++ b/examples/widgets/dialogs/findfiles/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(findfiles WIN32 MACOSX_BUNDLE +add_qt_gui_executable(findfiles WIN32 MACOSX_BUNDLE main.cpp window.cpp window.h ) diff --git a/examples/widgets/dialogs/licensewizard/CMakeLists.txt b/examples/widgets/dialogs/licensewizard/CMakeLists.txt index eef8e33ca1..a82800363e 100644 --- a/examples/widgets/dialogs/licensewizard/CMakeLists.txt +++ b/examples/widgets/dialogs/licensewizard/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS PrintSupport) -add_executable(licensewizard WIN32 MACOSX_BUNDLE +add_qt_gui_executable(licensewizard WIN32 MACOSX_BUNDLE licensewizard.cpp licensewizard.h licensewizard.qrc main.cpp ) diff --git a/examples/widgets/dialogs/standarddialogs/CMakeLists.txt b/examples/widgets/dialogs/standarddialogs/CMakeLists.txt index 2aa96fba06..91c74b71e1 100644 --- a/examples/widgets/dialogs/standarddialogs/CMakeLists.txt +++ b/examples/widgets/dialogs/standarddialogs/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(standarddialogs WIN32 MACOSX_BUNDLE +add_qt_gui_executable(standarddialogs WIN32 MACOSX_BUNDLE dialog.cpp dialog.h main.cpp ) diff --git a/examples/widgets/dialogs/tabdialog/CMakeLists.txt b/examples/widgets/dialogs/tabdialog/CMakeLists.txt index da05a322f3..ec88fd66d0 100644 --- a/examples/widgets/dialogs/tabdialog/CMakeLists.txt +++ b/examples/widgets/dialogs/tabdialog/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(tabdialog WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tabdialog WIN32 MACOSX_BUNDLE main.cpp tabdialog.cpp tabdialog.h ) diff --git a/examples/widgets/dialogs/trivialwizard/CMakeLists.txt b/examples/widgets/dialogs/trivialwizard/CMakeLists.txt index 307945b2c2..394816619d 100644 --- a/examples/widgets/dialogs/trivialwizard/CMakeLists.txt +++ b/examples/widgets/dialogs/trivialwizard/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(trivialwizard WIN32 MACOSX_BUNDLE +add_qt_gui_executable(trivialwizard WIN32 MACOSX_BUNDLE trivialwizard.cpp ) target_link_libraries(trivialwizard PUBLIC |