diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-10-15 17:04:27 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-10-17 12:13:00 +0200 |
| commit | b5af1408099dedd132f36e04d19cb5771a23ec28 (patch) | |
| tree | 85109c13469dcde91aea87e29ed52c116732fbf8 /cmake | |
| parent | 8ec4fd9cffe7977f6d7cb68ce38de4386a5795d6 (diff) | |
Generalize the winmain/qtmain entry-point library
The use-case is relevant for other platforms as well.
Now that Qt has a module system we can also replace a lot of the
hand crafted logic for linking with simpler constructs.
Change-Id: Ib6853aaf81bfea79c31f2de741d65b4b56f23ef6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtFindPackageHelpers.cmake | 6 | ||||
| -rw-r--r-- | cmake/QtStartupHelpers.cmake | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cmake/QtFindPackageHelpers.cmake b/cmake/QtFindPackageHelpers.cmake index d2bacd48cc..9e2c749abc 100644 --- a/cmake/QtFindPackageHelpers.cmake +++ b/cmake/QtFindPackageHelpers.cmake @@ -195,14 +195,14 @@ endfunction() # This function records a dependency between ${main_target_name} and ${dep_target_name} # at the CMake package level. -# E.g. Qt6CoreConfig.cmake needs to find_package(Qt6WinMain). +# E.g. Qt6CoreConfig.cmake needs to find_package(Qt6EntryPoint). # main_target_name = Core -# dep_target_name = WinMain +# dep_target_name = EntryPoint # This is just a convenience function that deals with Qt targets and their associated packages # instead of raw package names. function(qt_record_extra_qt_package_dependency main_target_name dep_target_name dep_package_version) - # WinMain -> Qt6WinMain. + # EntryPoint -> Qt6EntryPoint. qt_internal_module_info(qtfied_target_name "${dep_target_name}") qt_record_extra_package_dependency("${main_target_name}" "${qtfied_target_name_versioned}" "${dep_package_version}") diff --git a/cmake/QtStartupHelpers.cmake b/cmake/QtStartupHelpers.cmake index 0e7288e9cf..0ec431cbf4 100644 --- a/cmake/QtStartupHelpers.cmake +++ b/cmake/QtStartupHelpers.cmake @@ -8,9 +8,9 @@ function(qt_internal_setup_startup_target) set(dependent_target "Core") - # On windows, find_package(Qt6Core) should call find_package(Qt6WinMain) so that Startup can - # link against WinMain. + # On windows, find_package(Qt6Core) should call find_package(Qt6EntryPoint) so that Startup can + # link against EntryPoint. if(WIN32) - qt_record_extra_qt_package_dependency("${dependent_target}" WinMain "${PROJECT_VERSION}") + qt_record_extra_qt_package_dependency("${dependent_target}" EntryPoint "${PROJECT_VERSION}") endif() endfunction() |