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/qtestlib | |
| 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/qtestlib')
| -rw-r--r-- | examples/qtestlib/tutorial1/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/qtestlib/tutorial2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/qtestlib/tutorial3/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/qtestlib/tutorial4/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/qtestlib/tutorial5/CMakeLists.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/qtestlib/tutorial1/CMakeLists.txt b/examples/qtestlib/tutorial1/CMakeLists.txt index b30293a3e3..fb834211a7 100644 --- a/examples/qtestlib/tutorial1/CMakeLists.txt +++ b/examples/qtestlib/tutorial1/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Test) -add_executable(tutorial1 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tutorial1 WIN32 MACOSX_BUNDLE testqstring.cpp ) target_link_libraries(tutorial1 PUBLIC diff --git a/examples/qtestlib/tutorial2/CMakeLists.txt b/examples/qtestlib/tutorial2/CMakeLists.txt index ed7cc3f224..600cbb2ddd 100644 --- a/examples/qtestlib/tutorial2/CMakeLists.txt +++ b/examples/qtestlib/tutorial2/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Test) -add_executable(tutorial2 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tutorial2 WIN32 MACOSX_BUNDLE testqstring.cpp ) target_link_libraries(tutorial2 PUBLIC diff --git a/examples/qtestlib/tutorial3/CMakeLists.txt b/examples/qtestlib/tutorial3/CMakeLists.txt index 975ac4dfd6..457495997f 100644 --- a/examples/qtestlib/tutorial3/CMakeLists.txt +++ b/examples/qtestlib/tutorial3/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Test) -add_executable(tutorial3 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tutorial3 WIN32 MACOSX_BUNDLE testgui.cpp ) target_link_libraries(tutorial3 PUBLIC diff --git a/examples/qtestlib/tutorial4/CMakeLists.txt b/examples/qtestlib/tutorial4/CMakeLists.txt index 069afd031e..6d2c0f2ce1 100644 --- a/examples/qtestlib/tutorial4/CMakeLists.txt +++ b/examples/qtestlib/tutorial4/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Test) -add_executable(tutorial4 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tutorial4 WIN32 MACOSX_BUNDLE testgui.cpp ) target_link_libraries(tutorial4 PUBLIC diff --git a/examples/qtestlib/tutorial5/CMakeLists.txt b/examples/qtestlib/tutorial5/CMakeLists.txt index 65dba6dcb5..b0e2995b2a 100644 --- a/examples/qtestlib/tutorial5/CMakeLists.txt +++ b/examples/qtestlib/tutorial5/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Test) -add_executable(tutorial5 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tutorial5 WIN32 MACOSX_BUNDLE benchmarking.cpp ) target_link_libraries(tutorial5 PUBLIC |