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 /src/entrypoint | |
| 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 'src/entrypoint')
| -rw-r--r-- | src/entrypoint/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/entrypoint/CMakeLists.txt b/src/entrypoint/CMakeLists.txt index 4445f29940..cc511883c2 100644 --- a/src/entrypoint/CMakeLists.txt +++ b/src/entrypoint/CMakeLists.txt @@ -81,19 +81,19 @@ endif() # ---- Finally, make sure the static library can be consumed by clients ----- if(using_entrypoint_library) - target_link_libraries(EntryPoint INTERFACE EntryPointImplementation) + target_link_libraries(EntryPoint INTERFACE Qt6::EntryPointImplementation) qt_internal_get_target_property(entrypoint_implementation_ldflags EntryPointImplementation QT_MODULE_LDFLAGS) set_target_properties(EntryPoint PROPERTIES INTERFACE_QT_MODULE_PRI_EXTRA_CONTENT " - QT.entrypoint_implementation.name = QtEntryPointImplementation - QT.entrypoint_implementation.module = Qt6EntryPoint - QT.entrypoint_implementation.ldflags = ${entrypoint_implementation_ldflags} - QT.entrypoint_implementation.libs = $$QT_MODULE_LIB_BASE - QT.entrypoint_implementation.module_config = staticlib v2 internal_module - " +QT.entrypoint_implementation.name = QtEntryPointImplementation +QT.entrypoint_implementation.module = Qt6EntryPoint +QT.entrypoint_implementation.ldflags = ${entrypoint_implementation_ldflags} +QT.entrypoint_implementation.libs = $$QT_MODULE_LIB_BASE +QT.entrypoint_implementation.module_config = staticlib v2 internal_module +" INTERFACE_QT_MODULE_DEPENDS "entrypoint_implementation" ) |