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/embedded | |
| 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/embedded')
| -rw-r--r-- | examples/embedded/digiflip/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/embedded/flickable/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/embedded/flightinfo/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/embedded/lightmaps/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/embedded/raycasting/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/embedded/styleexample/CMakeLists.txt | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/examples/embedded/digiflip/CMakeLists.txt b/examples/embedded/digiflip/CMakeLists.txt index bc94d6809a..ee20c34c11 100644 --- a/examples/embedded/digiflip/CMakeLists.txt +++ b/examples/embedded/digiflip/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(digiflip WIN32 MACOSX_BUNDLE +add_qt_gui_executable(digiflip WIN32 MACOSX_BUNDLE digiflip.cpp ) target_link_libraries(digiflip PUBLIC diff --git a/examples/embedded/flickable/CMakeLists.txt b/examples/embedded/flickable/CMakeLists.txt index 8d5d9878f0..c71699b693 100644 --- a/examples/embedded/flickable/CMakeLists.txt +++ b/examples/embedded/flickable/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(flickable WIN32 MACOSX_BUNDLE +add_qt_gui_executable(flickable WIN32 MACOSX_BUNDLE flickable.cpp flickable.h main.cpp ) diff --git a/examples/embedded/flightinfo/CMakeLists.txt b/examples/embedded/flightinfo/CMakeLists.txt index 9afc98df76..e905531114 100644 --- a/examples/embedded/flightinfo/CMakeLists.txt +++ b/examples/embedded/flightinfo/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(flightinfo WIN32 MACOSX_BUNDLE +add_qt_gui_executable(flightinfo WIN32 MACOSX_BUNDLE flightinfo.cpp form.ui flightinfo.qrc # special case: add diff --git a/examples/embedded/lightmaps/CMakeLists.txt b/examples/embedded/lightmaps/CMakeLists.txt index 35171451bf..ea7239b7ac 100644 --- a/examples/embedded/lightmaps/CMakeLists.txt +++ b/examples/embedded/lightmaps/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(lightmaps WIN32 MACOSX_BUNDLE +add_qt_gui_executable(lightmaps WIN32 MACOSX_BUNDLE lightmaps.cpp lightmaps.h main.cpp mapzoom.cpp mapzoom.h diff --git a/examples/embedded/raycasting/CMakeLists.txt b/examples/embedded/raycasting/CMakeLists.txt index 0578b6e0bd..d27dbbe7a4 100644 --- a/examples/embedded/raycasting/CMakeLists.txt +++ b/examples/embedded/raycasting/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(raycasting WIN32 MACOSX_BUNDLE +add_qt_gui_executable(raycasting WIN32 MACOSX_BUNDLE raycasting.cpp raycasting.qrc ) target_link_libraries(raycasting PUBLIC diff --git a/examples/embedded/styleexample/CMakeLists.txt b/examples/embedded/styleexample/CMakeLists.txt index 2210d8cf9b..34ab6e4a22 100644 --- a/examples/embedded/styleexample/CMakeLists.txt +++ b/examples/embedded/styleexample/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(styleexample WIN32 MACOSX_BUNDLE +add_qt_gui_executable(styleexample WIN32 MACOSX_BUNDLE main.cpp stylewidget.cpp stylewidget.h stylewidget.ui styleexample.qrc # special case: add |