diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-11-12 12:58:06 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-11-12 18:43:43 +0100 |
| commit | 1777ddc234bb51dcf9b9c251e3872cc733a06e34 (patch) | |
| tree | dbe82e9d64946c13fc0e8368509068b9e8c9a3f2 /cmake | |
| parent | 4cc2196f6ae520d16c218a8599070050938f01f0 (diff) | |
cmake: Remove indirection via Startup target for EntryPoint
The EntryPoint interface target now contains all the logic
for what flags and optional static libraries to add when the
entrypoint is enabled.
The target property QT_NO_ENTRYPOINT can be used to disable
the entrypoint.
Change-Id: I9b14ff729366cd6307789c969ebd4b2ca19de77d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBaseGlobalTargets.cmake | 1 | ||||
| -rw-r--r-- | cmake/QtBuild.cmake | 1 | ||||
| -rw-r--r-- | cmake/QtPrlHelpers.cmake | 6 | ||||
| -rw-r--r-- | cmake/QtStartupHelpers.cmake | 16 |
4 files changed, 3 insertions, 21 deletions
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index b6efee7ad6..73bc83aca0 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -209,7 +209,6 @@ qt_copy_or_install(FILES cmake/QtSeparateDebugInfo.cmake cmake/QtSetup.cmake cmake/QtSimdHelpers.cmake - cmake/QtStartupHelpers.cmake cmake/QtStandaloneTestsConfig.cmake.in cmake/QtSyncQtHelpers.cmake cmake/QtTargetHelpers.cmake diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 5fc98f033c..5c03c433e3 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -483,7 +483,6 @@ include(QtRpathHelpers) include(QtSanitizerHelpers) include(QtScopeFinalizerHelpers) include(QtSimdHelpers) -include(QtStartupHelpers) include(QtSyncQtHelpers) include(QtTargetHelpers) include(QtTestHelpers) diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake index 35d321420c..e3f66c0cc8 100644 --- a/cmake/QtPrlHelpers.cmake +++ b/cmake/QtPrlHelpers.cmake @@ -30,9 +30,9 @@ function(qt_internal_walk_libs target out_var dict_name operation) endif() list(APPEND collected ${target}) - if(target STREQUAL "${QT_CMAKE_EXPORT_NAMESPACE}::Startup") - # We can't (and don't need to) process Startup, because it contains $<TARGET_PROPERTY:prop> - # genexes which get replaced with $<TARGET_PROPERTY:Startup,prop> genexes in the code below + if(target STREQUAL "${QT_CMAKE_EXPORT_NAMESPACE}::EntryPoint") + # We can't (and don't need to) process EntryPoint because it brings in $<TARGET_PROPERTY:prop> + # genexes which get replaced with $<TARGET_PROPERTY:EntryPoint,prop> genexes in the code below # and that causes 'INTERFACE_LIBRARY targets may only have whitelisted properties.' errors # with CMake versions equal to or lower than 3.18. These errors are super unintuitive to # debug because there's no mention that it's happening during a file(GENERATE) call. diff --git a/cmake/QtStartupHelpers.cmake b/cmake/QtStartupHelpers.cmake deleted file mode 100644 index 15d49e3271..0000000000 --- a/cmake/QtStartupHelpers.cmake +++ /dev/null @@ -1,16 +0,0 @@ -# Set up some internal requirements for the Startup target. -# -# The creation of the Startup target and its linkage setup happens in 2 places: -# - in src/corelib/CMakeLists.txt when building qtbase. -# - at find_package(Qt6Core) time. -# -# See _qt_internal_setup_startup_target() in Qt6CoreMacros.cmake for the implementation of that. -function(qt_internal_setup_startup_target) - set(dependent_target "Core") - - # On platforms that have a Qt entry-point, find_package(Qt6Core) should call - # find_package(Qt6EntryPoint) so that we can link against EntryPoint. - if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "iOS") - qt_record_extra_qt_package_dependency("${dependent_target}" EntryPoint "${PROJECT_VERSION}") - endif() -endfunction() |