qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtbase/cmake/QtFrameworkHelpers.cmake

260 lines
12 KiB
CMake
Raw Normal View History

Add license headers to cmake files CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I3b98cdc55ead806ec81ce09af9271f9b95af97fa Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-07-05 11:26:52 +00:00
# Copyright (C) 2022 The Qt Company Ltd.
Change the license of all CMakeLists.txt and *.cmake files to BSD Task-number: QTBUG-105718 Change-Id: I5d3ef70a31235868b9be6cb479b7621bf2a8ba39 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-08-19 13:21:34 +00:00
# SPDX-License-Identifier: BSD-3-Clause
Add license headers to cmake files CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I3b98cdc55ead806ec81ce09af9271f9b95af97fa Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-07-05 11:26:52 +00:00
CMake: Split QtBuild.cmake into smaller files QtBuild.cmake is huge. Split it. Move module, plugin, tools, executables and test related functions out of QtBuild.cmake into separate files. Do the same for many other things too. An additional requirement is that all the new Helpers files only define functions and macros. No global variable definitions are allowed, nor execution of commands with side effects. Some notes: qt_install_qml_files is removed because it's dead code. Some functions still need to be figured out, because they are interspersed and depend on various global state assignments. Task-number: QTBUG-86035 Change-Id: I21d79ff02eef923c202eb1000422888727cb0e2c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-08-13 15:37:47 +00:00
macro(qt_find_apple_system_frameworks)
if(APPLE)
CMake: Don't hardcode Xcode SDK frameworks into public dependencies Using find_library() to find an Xcode framework will end up embedding the absolute path of the framework into INTERFACE_LINK_LIBRARIES. A different machine might not have the SDK installed in the same location, which will cause build failures. This happens in our CI because Xcode is installed to /Applications/Xcode11.app. To fix this, replace all system framework paths with '-framework Foo' flags instead. We already do this for OpenGL and OpenGL ES. In the future we might want to convert these into full standalone FindFoo scripts that expose proper targets. Fixes: QTBUG-86299 Task-number: QTBUG-86422 Task-number: QTBUG-85240 Change-Id: I22b2b2d1d9e92108098d3974105e3758978cd8e2 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-07 14:44:45 +00:00
qt_internal_find_apple_system_framework(FWAppKit AppKit)
qnetworkproxy_mac: use API available both on iOS and macOS To extract system proxies, the one we used previously, was not available on iOS and thus we could not obtain system proxies there. Support is limited - no such things, as SOCKS/FTP/etc. proxies, only PAC (auto configuration), and HTTP/HTTPS. There are no keys to extract info about HTTPS, so instead we'll use CFNetworkCopyProxiesForURL ( looks like this enables exclusion lists (which are hidden) functionality and apparently from the system point of view HTTP/HTTPS are the same. Fixes: QTBUG-39869 Change-Id: I73af719a2e2b5cded706e6b3faa4b8eaa879352b Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2023-01-18 11:51:23 +00:00
qt_internal_find_apple_system_framework(FWCFNetwork CFNetwork)
CMake: Don't hardcode Xcode SDK frameworks into public dependencies Using find_library() to find an Xcode framework will end up embedding the absolute path of the framework into INTERFACE_LINK_LIBRARIES. A different machine might not have the SDK installed in the same location, which will cause build failures. This happens in our CI because Xcode is installed to /Applications/Xcode11.app. To fix this, replace all system framework paths with '-framework Foo' flags instead. We already do this for OpenGL and OpenGL ES. In the future we might want to convert these into full standalone FindFoo scripts that expose proper targets. Fixes: QTBUG-86299 Task-number: QTBUG-86422 Task-number: QTBUG-85240 Change-Id: I22b2b2d1d9e92108098d3974105e3758978cd8e2 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-07 14:44:45 +00:00
qt_internal_find_apple_system_framework(FWAssetsLibrary AssetsLibrary)
iOS: request authorization before presenting image-picker Right now, image picker view is shown first (it does not require access to photos, since it's essentially Photos app getting access to photos ...). Then, we use AssetsLibrary to get asset for an url (using ALAssetsLibrarie's -assetForURL method). This may trigger a permission-related alert, asking to: a. Select more photos or ... b. Allow access to all photos or ... c. Deny access. Showing this alert _after_ picker has selected an image makes little sense (and probably was never intended this way anyway). Instead, we now use Photos.framework to check the authorization and, if needed, we request an authorization (when the current status is 'Nondetermined'). If authorization is 'Granted' as a result, we show picker view and proceed as normal/before. Pick-to: 6.5 Task-number: QTBUG-109120 Change-Id: I0acfd7b0476346360d75a5e37f5845aaf2d6e3e0 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-03-24 09:53:11 +00:00
qt_internal_find_apple_system_framework(FWPhotos Photos)
CMake: Don't hardcode Xcode SDK frameworks into public dependencies Using find_library() to find an Xcode framework will end up embedding the absolute path of the framework into INTERFACE_LINK_LIBRARIES. A different machine might not have the SDK installed in the same location, which will cause build failures. This happens in our CI because Xcode is installed to /Applications/Xcode11.app. To fix this, replace all system framework paths with '-framework Foo' flags instead. We already do this for OpenGL and OpenGL ES. In the future we might want to convert these into full standalone FindFoo scripts that expose proper targets. Fixes: QTBUG-86299 Task-number: QTBUG-86422 Task-number: QTBUG-85240 Change-Id: I22b2b2d1d9e92108098d3974105e3758978cd8e2 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-07 14:44:45 +00:00
qt_internal_find_apple_system_framework(FWAudioToolbox AudioToolbox)
qt_internal_find_apple_system_framework(FWApplicationServices ApplicationServices)
qt_internal_find_apple_system_framework(FWCarbon Carbon)
qt_internal_find_apple_system_framework(FWCoreFoundation CoreFoundation)
qt_internal_find_apple_system_framework(FWCoreServices CoreServices)
qt_internal_find_apple_system_framework(FWCoreGraphics CoreGraphics)
qt_internal_find_apple_system_framework(FWCoreText CoreText)
qt_internal_find_apple_system_framework(FWCoreVideo CoreVideo)
CMake: Add CryptoTokenKit framework for macOS Set ${FWCryptoTokenKit} when the framework has been found. This is useful for WIP card reader support in QtConnectivity. Task-number: QTBUG-97946 Change-Id: I0e85e0fd2e0fc45fb3069bbdaa2d8b2c927a6c2d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-20 22:58:17 +00:00
qt_internal_find_apple_system_framework(FWCryptoTokenKit CryptoTokenKit)
CMake: Don't hardcode Xcode SDK frameworks into public dependencies Using find_library() to find an Xcode framework will end up embedding the absolute path of the framework into INTERFACE_LINK_LIBRARIES. A different machine might not have the SDK installed in the same location, which will cause build failures. This happens in our CI because Xcode is installed to /Applications/Xcode11.app. To fix this, replace all system framework paths with '-framework Foo' flags instead. We already do this for OpenGL and OpenGL ES. In the future we might want to convert these into full standalone FindFoo scripts that expose proper targets. Fixes: QTBUG-86299 Task-number: QTBUG-86422 Task-number: QTBUG-85240 Change-Id: I22b2b2d1d9e92108098d3974105e3758978cd8e2 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-07 14:44:45 +00:00
qt_internal_find_apple_system_framework(FWDiskArbitration DiskArbitration)
qt_internal_find_apple_system_framework(FWFoundation Foundation)
qt_internal_find_apple_system_framework(FWIOBluetooth IOBluetooth)
qt_internal_find_apple_system_framework(FWIOKit IOKit)
qt_internal_find_apple_system_framework(FWIOSurface IOSurface)
qt_internal_find_apple_system_framework(FWImageIO ImageIO)
qt_internal_find_apple_system_framework(FWMetal Metal)
qt_internal_find_apple_system_framework(FWMobileCoreServices MobileCoreServices)
qt_internal_find_apple_system_framework(FWQuartzCore QuartzCore)
qt_internal_find_apple_system_framework(FWSecurity Security)
qt_internal_find_apple_system_framework(FWSystemConfiguration SystemConfiguration)
qt_internal_find_apple_system_framework(FWUIKit UIKit)
CMake: add CoreLocation framework for macOS Task-number: QTBUG-89854 Change-Id: Icd52a6dd0ae36ae91599ab9a583e6920f2d2ba4c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-01-15 11:59:14 +00:00
qt_internal_find_apple_system_framework(FWCoreLocation CoreLocation)
Add CoreMotion to the list of looked-up frameworks (Mac/iOS) The CoreMotion is required by the QtSensor module. Task-number: QTBUG-92502 Change-Id: I7f1853131aa96b2cb052862d5bf492df5ec18150 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-14 08:04:12 +00:00
qt_internal_find_apple_system_framework(FWCoreMotion CoreMotion)
CMake: Don't hardcode Xcode SDK frameworks into public dependencies Using find_library() to find an Xcode framework will end up embedding the absolute path of the framework into INTERFACE_LINK_LIBRARIES. A different machine might not have the SDK installed in the same location, which will cause build failures. This happens in our CI because Xcode is installed to /Applications/Xcode11.app. To fix this, replace all system framework paths with '-framework Foo' flags instead. We already do this for OpenGL and OpenGL ES. In the future we might want to convert these into full standalone FindFoo scripts that expose proper targets. Fixes: QTBUG-86299 Task-number: QTBUG-86422 Task-number: QTBUG-85240 Change-Id: I22b2b2d1d9e92108098d3974105e3758978cd8e2 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-07 14:44:45 +00:00
qt_internal_find_apple_system_framework(FWWatchKit WatchKit)
qt_internal_find_apple_system_framework(FWGameController GameController)
CMake: Add CoreBluetooth framework for macOS The Qt bluetooth module uses ${FWCoreBluetooth} when building for iOS, but that evaluated to empty. Pick-to: 6.2 Change-Id: I93ff2c30697a912bed454087ae260fae9cc41b0f Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-11-09 11:24:35 +00:00
qt_internal_find_apple_system_framework(FWCoreBluetooth CoreBluetooth)
Add permission API backend for macOS and iOS When submitting applications to the iOS and macOS AppStore the application goes through static analysis, which will trigger on uses of various privacy protected APIs, unless the application has a corresponding usage description for the permission in the Info.plist file. This applies even if the application never requests the given permission, but just links to a Qt library that has the offending symbols or library dependencies. To ensure that the application does not have to add usage descriptions to their Info.plist for permissions they never plan to use we split up the various permission implementations into small static libraries that register with the Qt plugin mechanism as permission backends. We can then inspect the application's Info.plist at configure time and only add the relevant static permission libraries. Furthermore, since some permissions can be checked without any usage description, we allow the implementation to be split up into two separate translation units. By putting the request in its own translation unit we can selectively include it during linking by telling the linker to look for a special symbol. This is useful for libraries such as Qt Multimedia who would like to check the current permission status, but without needing to request any permission of its own. Done-with: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Change-Id: Ic2a43e1a0c45a91df6101020639f473ffd9454cc Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-05-10 13:02:43 +00:00
qt_internal_find_apple_system_framework(FWAVFoundation AVFoundation)
CMake: add Photos.framework to framework helpers This would allow us using Photos.framework/PHAssets on iOS (instead of now-deprecated 'Assets' library). Change-Id: I922e4765e8fdadf872f801b55a1e4ef4368e65b0 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2025-04-02 13:19:38 +00:00
qt_internal_find_apple_system_framework(FWPhotos Photos)
Add permission API backend for macOS and iOS When submitting applications to the iOS and macOS AppStore the application goes through static analysis, which will trigger on uses of various privacy protected APIs, unless the application has a corresponding usage description for the permission in the Info.plist file. This applies even if the application never requests the given permission, but just links to a Qt library that has the offending symbols or library dependencies. To ensure that the application does not have to add usage descriptions to their Info.plist for permissions they never plan to use we split up the various permission implementations into small static libraries that register with the Qt plugin mechanism as permission backends. We can then inspect the application's Info.plist at configure time and only add the relevant static permission libraries. Furthermore, since some permissions can be checked without any usage description, we allow the implementation to be split up into two separate translation units. By putting the request in its own translation unit we can selectively include it during linking by telling the linker to look for a special symbol. This is useful for libraries such as Qt Multimedia who would like to check the current permission status, but without needing to request any permission of its own. Done-with: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Change-Id: Ic2a43e1a0c45a91df6101020639f473ffd9454cc Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-05-10 13:02:43 +00:00
qt_internal_find_apple_system_framework(FWContacts Contacts)
qt_internal_find_apple_system_framework(FWEventKit EventKit)
qt_internal_find_apple_system_framework(FWHealthKit HealthKit)
macOS: Reset save dialog extension when resetting file name filter We map QFileDialog name filters to NSSavePanel.allowedFileTypes, for example turning "Text Files (*.txt)" into allowedFileTypes = @[@"txt"]. In this case, the NSSavePanel will automatically add the extension to the user's file name, if they just type "foo". When a filter allows all files, we reset the allowedFileTypes to nil, but this does not reset the automatically added extension, so if the user switches from one filter (*.txt) to another (*.*), the file name will still have a .txt extension. This is problematic when the save panel's file name field does not show the extension to the user, which can happen automatically if the user types an initial file name without an extension, overriding what we've asked by setting extensionHidden=NO. When that happens, the user is shown "foo", but the actual file name is "foo.txt". To mitigate this confusing situation we do a round-trip via the UTTypeDirectory content type, which is a valid type without any extension. This forces the save panel to remove any extensions added automatically by previous filters. Pick-to: 6.7 Change-Id: Ia17a8c2734eff656116ef77a9813113a5076e9cc Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2024-01-03 18:08:02 +00:00
qt_internal_find_apple_system_framework(FWUniformTypeIdentifiers UniformTypeIdentifiers)
QNCM[Mac]: Update from SCNetworkReachability to Network framework Since SCNetworkReachability is deprecated, the implementation is now updated to use the Network framework. [ChangeLog][QNetworkInformation] Replace deprecated SCNetworkReachability implementation with Network framework (iOS, macOS) Fixes: QTBUG-132103 Change-Id: Iff4a667fd07002451b7d49cc8fd069945d426aab Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io>
2024-11-23 08:02:34 +00:00
qt_internal_find_apple_system_framework(FWNetwork Network)
gui: link with OpenGL framework qopengl.h pulls in headers from the OpenGL framework on macos when opengl is enabled. We should therefore also link the OpenGL framework. fixes linker error in libqcocoa: Undefined symbols for architecture x86_64: "_glGetIntegerv", referenced from: QCocoaGLContext::updateSurfaceFormat() in libqcocoa.a(qcocoaglcontext.mm.o) "_glGetString", referenced from: QCocoaGLContext::updateSurfaceFormat() in libqcocoa.a(qcocoaglcontext.mm.o) Change-Id: I02d2c80e2652da0cf16eaca7ab161cf711599dc2 Pick-to: 6.9 6.8 6.5 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2024-12-19 02:43:32 +00:00
qt_internal_find_apple_system_framework(FWOpenGL OpenGL)
Teach QImage::toCGImage() about most of our image formats Instead of hard-coding the mapping between QImage formats and the corresponding CGBitmapInfo we now build up the individual bits of the bitmap info based on the pixel format of the image. This gives us support for formats like RGB30 and the various float formats that are important for HDR. The qt_mac_cgImageFormatForImage helper now also resolves the correct bits per component, as well as the color space, so that consumers can't make any mistakes in what it passes to the CoreGraphics APIs. The validity of the format mappings has been tested by saving both the QImage and the CGImage to a PNG file, and comparing the results visually. Once we have the same support for converting CGImageRefs to QImage we can do this round-trip-verification in a test. [ChangeLog][QtGui] QImage::toCGImage() now supports most of the QImage formats. If a format is not supported the function will return a null CGImageRef. Change-Id: I3378ca00f7321e0c2c9d9a88a0dd25f5a893c56b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2025-08-19 13:14:43 +00:00
qt_internal_find_apple_system_framework(FWAccelerate Accelerate)
CMake: Split QtBuild.cmake into smaller files QtBuild.cmake is huge. Split it. Move module, plugin, tools, executables and test related functions out of QtBuild.cmake into separate files. Do the same for many other things too. An additional requirement is that all the new Helpers files only define functions and macros. No global variable definitions are allowed, nor execution of commands with side effects. Some notes: qt_install_qml_files is removed because it's dead code. Some functions still need to be figured out, because they are interspersed and depend on various global state assignments. Task-number: QTBUG-86035 Change-Id: I21d79ff02eef923c202eb1000422888727cb0e2c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-08-13 15:37:47 +00:00
endif()
endmacro()
CMake: Don't hardcode Xcode SDK frameworks into public dependencies Using find_library() to find an Xcode framework will end up embedding the absolute path of the framework into INTERFACE_LINK_LIBRARIES. A different machine might not have the SDK installed in the same location, which will cause build failures. This happens in our CI because Xcode is installed to /Applications/Xcode11.app. To fix this, replace all system framework paths with '-framework Foo' flags instead. We already do this for OpenGL and OpenGL ES. In the future we might want to convert these into full standalone FindFoo scripts that expose proper targets. Fixes: QTBUG-86299 Task-number: QTBUG-86422 Task-number: QTBUG-85240 Change-Id: I22b2b2d1d9e92108098d3974105e3758978cd8e2 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-07 14:44:45 +00:00
# Given framework_name == 'IOKit', sets non-cache variable 'FWIOKit' to '-framework IOKit' in
# the calling directory scope if the framework is found, or 'IOKit-NOTFOUND'.
function(qt_internal_find_apple_system_framework out_var framework_name)
# To avoid creating many FindFoo.cmake files for each apple system framework, populate each
# FWFoo variable with '-framework Foo' instead of an absolute path to the framework. This makes
# the generated CMake target files relocatable, so that Xcode SDK absolute paths are not
# hardcoded, like with Xcode11.app on the CI.
# We might revisit this later.
set(cache_var_name "${out_var}Internal")
CMake: Fix finding of system frameworks on macOS if vcpkg is used The vcpkg toolchain file sets CMAKE_FIND_FRAMEWORK to LAST unless VCPKG_PREFER_SYSTEM_LIBS is enabled. The latter however has other unwanted implications and is also deprecated. The CMAKE_FIND_FRAMEWORK=LAST setting breaks qt_internal_find_system_framework for libraries like "Network" that are available as framework and as TBD file. Set CMAKE_FIND_FRAMEWORK temporarily to FIRST (the default value) in qt_internal_find_system_framework if vcpkg is used. Change-Id: I2fd3152d75b043a396f7c9b6269e623700077b98 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2025-06-27 15:10:28 +00:00
if(QT_USE_VCPKG)
# vcpkg.cmake sets CMAKE_FIND_FRAMEWORK to LAST and this setting will find e.g.
# libnetwork.tbd instead of Network.framework. Force the default value here.
set(CMAKE_FIND_FRAMEWORK FIRST)
endif()
CMake: Don't hardcode Xcode SDK frameworks into public dependencies Using find_library() to find an Xcode framework will end up embedding the absolute path of the framework into INTERFACE_LINK_LIBRARIES. A different machine might not have the SDK installed in the same location, which will cause build failures. This happens in our CI because Xcode is installed to /Applications/Xcode11.app. To fix this, replace all system framework paths with '-framework Foo' flags instead. We already do this for OpenGL and OpenGL ES. In the future we might want to convert these into full standalone FindFoo scripts that expose proper targets. Fixes: QTBUG-86299 Task-number: QTBUG-86422 Task-number: QTBUG-85240 Change-Id: I22b2b2d1d9e92108098d3974105e3758978cd8e2 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-07 14:44:45 +00:00
find_library(${cache_var_name} "${framework_name}")
if(${cache_var_name} AND ${cache_var_name} MATCHES ".framework$")
set(${out_var} "-framework ${framework_name}" PARENT_SCOPE)
else()
set(${out_var} "${out_var}-NOTFOUND" PARENT_SCOPE)
endif()
endfunction()
Enable shared library build of Qt for iOS As of f68e2c92cc0ed2c1929140402c061359bc2363a5, and its follow up changes, we can now link individual plugins statically, even if the Qt build is generally a shared build. This allows us to build Qt for iOS as shared libraries, while still keeping the platform plugin as a static library, since this is harder to port over to a shared library. This gives the benefit of faster turnaround during development, as well as binary compatibility promises for the main Qt libraries, without having to go fully shared for all of Qt. Static builds are still the default, due to the downsides of larger application bundles and slower load times for shared builds. For now the user has to manually tick the "Embed & Sign" check box in Xcode for each Qt library, which is only available with Xcode projects generated by the qmake Xcode generator. Task-number: QTBUG-85974 Change-Id: Id2b7bd2823c8e7c79068dda95295b574ada8d7f2 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-12-16 15:34:31 +00:00
# Copy header files to the framework's Headers directory
CMake: Split QtBuild.cmake into smaller files QtBuild.cmake is huge. Split it. Move module, plugin, tools, executables and test related functions out of QtBuild.cmake into separate files. Do the same for many other things too. An additional requirement is that all the new Helpers files only define functions and macros. No global variable definitions are allowed, nor execution of commands with side effects. Some notes: qt_install_qml_files is removed because it's dead code. Some functions still need to be figured out, because they are interspersed and depend on various global state assignments. Task-number: QTBUG-86035 Change-Id: I21d79ff02eef923c202eb1000422888727cb0e2c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-08-13 15:37:47 +00:00
# Use this function for header files that
# - are not added as source files to the target
# - are not marked as PUBLIC_HEADER
# - or are private and supposed to end up in the 6.7.8/QtXYZ/private subdir.
function(qt_copy_framework_headers target)
get_target_property(is_fw ${target} FRAMEWORK)
if(NOT "${is_fw}")
return()
endif()
Allow specifying multiple header types in qt_copy_framework_headers qt_copy_framework_headers now can accept all the headers in one call. This is useful for upcoming changes when it will accept generator expressions as the input instead of actual files. Change-Id: I110b6d9e6de976b2a7581902e051e38571716c5f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-05-20 14:12:56 +00:00
set(options)
CMake: Split QtBuild.cmake into smaller files QtBuild.cmake is huge. Split it. Move module, plugin, tools, executables and test related functions out of QtBuild.cmake into separate files. Do the same for many other things too. An additional requirement is that all the new Helpers files only define functions and macros. No global variable definitions are allowed, nor execution of commands with side effects. Some notes: qt_install_qml_files is removed because it's dead code. Some functions still need to be figured out, because they are interspersed and depend on various global state assignments. Task-number: QTBUG-86035 Change-Id: I21d79ff02eef923c202eb1000422888727cb0e2c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-08-13 15:37:47 +00:00
set(oneValueArgs)
Add enablers to expose semi-public APIs for QtQuick3D Follow the same patterns as for qpa and rhi. Semi-public APIs will be put under the "namespace" ssg which is short for Spatial Scene Graph. Taks-number: QTBUG-116570 Change-Id: I38887f129ec90e67f6a929a0d8ea5ea8b8c49ee8 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-08-04 14:57:42 +00:00
set(multiValueArgs PUBLIC PRIVATE QPA RHI SSG)
Allow specifying multiple header types in qt_copy_framework_headers qt_copy_framework_headers now can accept all the headers in one call. This is useful for upcoming changes when it will accept generator expressions as the input instead of actual files. Change-Id: I110b6d9e6de976b2a7581902e051e38571716c5f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-05-20 14:12:56 +00:00
cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
CMake: Split QtBuild.cmake into smaller files QtBuild.cmake is huge. Split it. Move module, plugin, tools, executables and test related functions out of QtBuild.cmake into separate files. Do the same for many other things too. An additional requirement is that all the new Helpers files only define functions and macros. No global variable definitions are allowed, nor execution of commands with side effects. Some notes: qt_install_qml_files is removed because it's dead code. Some functions still need to be figured out, because they are interspersed and depend on various global state assignments. Task-number: QTBUG-86035 Change-Id: I21d79ff02eef923c202eb1000422888727cb0e2c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-08-13 15:37:47 +00:00
Move the framework related information to the common function Since the information about framework is performed in multiple places it's quite hard to control its consistency. This moves the obtaining of framework related information to the common function and adjusts the use of the information across the repo. Change-Id: I1f488d41dcea75a1e8c361926792a6b7c45e5a3f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-26 18:48:58 +00:00
qt_internal_get_framework_info(fw ${target})
get_target_property(output_dir ${target} LIBRARY_OUTPUT_DIRECTORY)
Allow specifying multiple header types in qt_copy_framework_headers qt_copy_framework_headers now can accept all the headers in one call. This is useful for upcoming changes when it will accept generator expressions as the input instead of actual files. Change-Id: I110b6d9e6de976b2a7581902e051e38571716c5f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-05-20 14:12:56 +00:00
set(output_dir_PUBLIC "${output_dir}/${fw_versioned_header_dir}")
set(output_dir_PRIVATE "${output_dir}/${fw_private_module_header_dir}/private")
set(output_dir_QPA "${output_dir}/${fw_private_module_header_dir}/qpa")
rhi: Make it a QPA-style private but semi-public API qrhi.h, qshader.h, qshaderdescription.h (and qshaderbaker.h from shadertools; done separately) become "RHI APIs", following the concept of QPA APIs. Mirror completely what is done for QPA headers, but using the "rhi" prefix for the headers. This involves updating syncqt to handle the new category of headers. (a note on the regex: matching everything starting with "qrhi" is not acceptable due to incorrectly matching existing and future headers, hence specifying the four header names explicitly) There is going to be one difference to QPA: the documentation for everything RHI is going to be public and part of the regular docs, not hidden with \internal. In addition to the header renaming and adding the comments and documentation notes and warnings, there is one significant change here: there is no longer a need to do API-specific includes, such as qrhid3d11[_p].h, qrhivulkan[_p].h, etc. These are simply merged into a single header that is then included from qrhi.h. This means that users within Qt, and any future applications can just do #include <rhi/qrhi.h> (or rhi/qshader.h if the QRhi stuff is not relevant), no other headers are needed. There are no changes to functionality in this patch. Only the documentation is expanded, quite a lot, to eliminate all qdoc warnings and make the generated API docs complete. An example, with a quite extensive doc page is added as well. Task-number: QTBUG-113331 Change-Id: I91c749826348f14320cb335b1c83e9d1ea2b1d8b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-04-27 11:16:29 +00:00
set(output_dir_RHI "${output_dir}/${fw_private_module_header_dir}/rhi")
Add enablers to expose semi-public APIs for QtQuick3D Follow the same patterns as for qpa and rhi. Semi-public APIs will be put under the "namespace" ssg which is short for Spatial Scene Graph. Taks-number: QTBUG-116570 Change-Id: I38887f129ec90e67f6a929a0d8ea5ea8b8c49ee8 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-08-04 14:57:42 +00:00
set(output_dir_SSG "${output_dir}/${fw_private_module_header_dir}/ssg")
Allow specifying multiple header types in qt_copy_framework_headers qt_copy_framework_headers now can accept all the headers in one call. This is useful for upcoming changes when it will accept generator expressions as the input instead of actual files. Change-Id: I110b6d9e6de976b2a7581902e051e38571716c5f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-05-20 14:12:56 +00:00
Remove framework-related functionality from syncqt The files generated by syncqt should land not only in module include directory, but also in framework directory. Before syncqt made two copies of the generated files one in staging directory and the second one in module framework directory. This commit moves all logic related to framework header files to cmake scripts. This is done for both consistency and simlifying the logic. The whole module .syncqt_staging directory is copying to the framework library in cmake. [ChangeLog][Tools][syncqt] '-framework' and '-frameworkIncludeDir' arguments were removed. The related logic is moved to cmake scripts. Task-number: QTBUG-116483 Pick-to: 6.6 6.5 Change-Id: If79c5470d2ab51eb7fc083bce6fb01858bed76ba Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-09-20 16:29:44 +00:00
qt_internal_module_info(module "${target}")
Move the framework related information to the common function Since the information about framework is performed in multiple places it's quite hard to control its consistency. This moves the obtaining of framework related information to the common function and adjusts the use of the information across the repo. Change-Id: I1f488d41dcea75a1e8c361926792a6b7c45e5a3f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-26 18:48:58 +00:00
Remove framework-related functionality from syncqt The files generated by syncqt should land not only in module include directory, but also in framework directory. Before syncqt made two copies of the generated files one in staging directory and the second one in module framework directory. This commit moves all logic related to framework header files to cmake scripts. This is done for both consistency and simlifying the logic. The whole module .syncqt_staging directory is copying to the framework library in cmake. [ChangeLog][Tools][syncqt] '-framework' and '-frameworkIncludeDir' arguments were removed. The related logic is moved to cmake scripts. Task-number: QTBUG-116483 Pick-to: 6.6 6.5 Change-Id: If79c5470d2ab51eb7fc083bce6fb01858bed76ba Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-09-20 16:29:44 +00:00
set(out_files "")
set(in_files "")
Change the mechanism that copies framework header files Split the header copy custom commands into two blocks and add <module>_sync_headers_fw_copy target that is responsible for the copy of CaMeL-case header aliases. For the Ninja generator we leave the file-level dependencies between the <module>_sync_headers_fw_copy target and header copy commands. For the Unix Makefiles generator we put the command directly to the target to make sure it's executed by make. Also add the explicit commands for creating the output header directories. Fixes: QTBUG-122200 Pick-to: 6.5 6.6 6.7 Change-Id: I71ba716d17a879f20ae0869cf2257d246ac17eff Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2024-02-13 12:33:46 +00:00
set(out_dirs "")
Remove framework-related functionality from syncqt The files generated by syncqt should land not only in module include directory, but also in framework directory. Before syncqt made two copies of the generated files one in staging directory and the second one in module framework directory. This commit moves all logic related to framework header files to cmake scripts. This is done for both consistency and simlifying the logic. The whole module .syncqt_staging directory is copying to the framework library in cmake. [ChangeLog][Tools][syncqt] '-framework' and '-frameworkIncludeDir' arguments were removed. The related logic is moved to cmake scripts. Task-number: QTBUG-116483 Pick-to: 6.6 6.5 Change-Id: If79c5470d2ab51eb7fc083bce6fb01858bed76ba Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-09-20 16:29:44 +00:00
set(copy_commands "")
Add enablers to expose semi-public APIs for QtQuick3D Follow the same patterns as for qpa and rhi. Semi-public APIs will be put under the "namespace" ssg which is short for Spatial Scene Graph. Taks-number: QTBUG-116570 Change-Id: I38887f129ec90e67f6a929a0d8ea5ea8b8c49ee8 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-08-04 14:57:42 +00:00
foreach(type IN ITEMS PUBLIC PRIVATE QPA RHI SSG)
Remove framework-related functionality from syncqt The files generated by syncqt should land not only in module include directory, but also in framework directory. Before syncqt made two copies of the generated files one in staging directory and the second one in module framework directory. This commit moves all logic related to framework header files to cmake scripts. This is done for both consistency and simlifying the logic. The whole module .syncqt_staging directory is copying to the framework library in cmake. [ChangeLog][Tools][syncqt] '-framework' and '-frameworkIncludeDir' arguments were removed. The related logic is moved to cmake scripts. Task-number: QTBUG-116483 Pick-to: 6.6 6.5 Change-Id: If79c5470d2ab51eb7fc083bce6fb01858bed76ba Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-09-20 16:29:44 +00:00
set(in_files_${type} "")
Allow specifying multiple header types in qt_copy_framework_headers qt_copy_framework_headers now can accept all the headers in one call. This is useful for upcoming changes when it will accept generator expressions as the input instead of actual files. Change-Id: I110b6d9e6de976b2a7581902e051e38571716c5f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-05-20 14:12:56 +00:00
set(fw_output_header_dir "${output_dir_${type}}")
foreach(hdr IN LISTS arg_${type})
get_filename_component(in_file_path ${hdr} ABSOLUTE)
get_filename_component(in_file_name ${hdr} NAME)
set(out_file_path "${fw_output_header_dir}/${in_file_name}")
list(APPEND out_files ${out_file_path})
Remove framework-related functionality from syncqt The files generated by syncqt should land not only in module include directory, but also in framework directory. Before syncqt made two copies of the generated files one in staging directory and the second one in module framework directory. This commit moves all logic related to framework header files to cmake scripts. This is done for both consistency and simlifying the logic. The whole module .syncqt_staging directory is copying to the framework library in cmake. [ChangeLog][Tools][syncqt] '-framework' and '-frameworkIncludeDir' arguments were removed. The related logic is moved to cmake scripts. Task-number: QTBUG-116483 Pick-to: 6.6 6.5 Change-Id: If79c5470d2ab51eb7fc083bce6fb01858bed76ba Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-09-20 16:29:44 +00:00
list(APPEND in_files_${type} "${in_file_path}")
Allow specifying multiple header types in qt_copy_framework_headers qt_copy_framework_headers now can accept all the headers in one call. This is useful for upcoming changes when it will accept generator expressions as the input instead of actual files. Change-Id: I110b6d9e6de976b2a7581902e051e38571716c5f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-05-20 14:12:56 +00:00
endforeach()
Remove framework-related functionality from syncqt The files generated by syncqt should land not only in module include directory, but also in framework directory. Before syncqt made two copies of the generated files one in staging directory and the second one in module framework directory. This commit moves all logic related to framework header files to cmake scripts. This is done for both consistency and simlifying the logic. The whole module .syncqt_staging directory is copying to the framework library in cmake. [ChangeLog][Tools][syncqt] '-framework' and '-frameworkIncludeDir' arguments were removed. The related logic is moved to cmake scripts. Task-number: QTBUG-116483 Pick-to: 6.6 6.5 Change-Id: If79c5470d2ab51eb7fc083bce6fb01858bed76ba Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-09-20 16:29:44 +00:00
if(in_files_${type})
cmake: Don't create framework header directories unless we have headers qt_copy_framework_headers was unconditionally creating all the private, qpa, rhi, and ssg header subdirectories, even if we didn't have any headers to put in them, which doesn't match how we structure the normal include directories. Pick-to: 6.10 6.9 6.8 Change-Id: I9efe2fd9c4f6d10f57e30ffcba2b912dae35a2c4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2025-09-11 10:14:17 +00:00
list(APPEND out_dirs "${fw_output_header_dir}")
Remove framework-related functionality from syncqt The files generated by syncqt should land not only in module include directory, but also in framework directory. Before syncqt made two copies of the generated files one in staging directory and the second one in module framework directory. This commit moves all logic related to framework header files to cmake scripts. This is done for both consistency and simlifying the logic. The whole module .syncqt_staging directory is copying to the framework library in cmake. [ChangeLog][Tools][syncqt] '-framework' and '-frameworkIncludeDir' arguments were removed. The related logic is moved to cmake scripts. Task-number: QTBUG-116483 Pick-to: 6.6 6.5 Change-Id: If79c5470d2ab51eb7fc083bce6fb01858bed76ba Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-09-20 16:29:44 +00:00
list(APPEND copy_commands
COMMAND ${CMAKE_COMMAND} -E copy ${in_files_${type}} "${fw_output_header_dir}")
list(APPEND in_files ${in_files_${type}})
endif()
CMake: Split QtBuild.cmake into smaller files QtBuild.cmake is huge. Split it. Move module, plugin, tools, executables and test related functions out of QtBuild.cmake into separate files. Do the same for many other things too. An additional requirement is that all the new Helpers files only define functions and macros. No global variable definitions are allowed, nor execution of commands with side effects. Some notes: qt_install_qml_files is removed because it's dead code. Some functions still need to be figured out, because they are interspersed and depend on various global state assignments. Task-number: QTBUG-86035 Change-Id: I21d79ff02eef923c202eb1000422888727cb0e2c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-08-13 15:37:47 +00:00
endforeach()
Remove framework-related functionality from syncqt The files generated by syncqt should land not only in module include directory, but also in framework directory. Before syncqt made two copies of the generated files one in staging directory and the second one in module framework directory. This commit moves all logic related to framework header files to cmake scripts. This is done for both consistency and simlifying the logic. The whole module .syncqt_staging directory is copying to the framework library in cmake. [ChangeLog][Tools][syncqt] '-framework' and '-frameworkIncludeDir' arguments were removed. The related logic is moved to cmake scripts. Task-number: QTBUG-116483 Pick-to: 6.6 6.5 Change-Id: If79c5470d2ab51eb7fc083bce6fb01858bed76ba Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-09-20 16:29:44 +00:00
list(REMOVE_DUPLICATES out_files)
list(REMOVE_DUPLICATES in_files)
Change the mechanism that copies framework header files Split the header copy custom commands into two blocks and add <module>_sync_headers_fw_copy target that is responsible for the copy of CaMeL-case header aliases. For the Ninja generator we leave the file-level dependencies between the <module>_sync_headers_fw_copy target and header copy commands. For the Unix Makefiles generator we put the command directly to the target to make sure it's executed by make. Also add the explicit commands for creating the output header directories. Fixes: QTBUG-122200 Pick-to: 6.5 6.6 6.7 Change-Id: I71ba716d17a879f20ae0869cf2257d246ac17eff Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2024-02-13 12:33:46 +00:00
set(copy_fw_sync_headers_command
"${CMAKE_COMMAND}" -E copy_directory
"${module_build_interface_include_dir}/.syncqt_staging"
"${output_dir}/${fw_versioned_header_dir}"
)
CMake: Fix framework headers not being copied after rm-ing build dir If a build dir is removed using rm -r *, this still leaves dot files around, specifically the .ninja_log file. Because of a possibly unspecified behavior of listing directories as OUTPUTs in a add_custom_command call for the ${target}_copy_fw_sync_headers custom target, we end up with a situation where the custom command is not rerun by ninja because the directory OUTPUT was encountered in the .ninja_log file. Make sure to specify an additional file as an OUTPUT, to ensure the command does rerun, and thus copies all headers from the syncqt staging directory. Amends 103eca1070a75bfa97d0b72b94e0c759ef0bcd1c Pick-to: 6.5 6.7 6.8 Fixes: QTBUG-126056 Change-Id: I5664cf074158199e0c7fd5e312ecf739133d7f2e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2024-06-04 13:06:37 +00:00
set(copy_fw_sync_headers_marker_file
"${CMAKE_CURRENT_BINARY_DIR}/${target}_fw_sync_headers_marker_file"
)
set(copy_fw_sync_headers_marker_file_command
"${CMAKE_COMMAND}" -E touch "${copy_fw_sync_headers_marker_file}"
)
macOS: Create framework headers symlink manually instead of via CMake As the latter requires us to awkwardly create a fake dummy header in the frameworks we ship. The symlink points to the `Current` version symlink, just like for the library itself and Resources -- both of which CMake generates still. Change-Id: I2db3f218a3c01cb1be73a0d7a514241b6c472ba3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2025-09-11 15:18:54 +00:00
if(NOT UIKIT)
set(create_headers_symlink_command
"${CMAKE_COMMAND}" -E create_symlink
"Versions/Current/Headers"
"${output_dir}/${fw_header_dir}"
)
endif()
Change the mechanism that copies framework header files Split the header copy custom commands into two blocks and add <module>_sync_headers_fw_copy target that is responsible for the copy of CaMeL-case header aliases. For the Ninja generator we leave the file-level dependencies between the <module>_sync_headers_fw_copy target and header copy commands. For the Unix Makefiles generator we put the command directly to the target to make sure it's executed by make. Also add the explicit commands for creating the output header directories. Fixes: QTBUG-122200 Pick-to: 6.5 6.6 6.7 Change-Id: I71ba716d17a879f20ae0869cf2257d246ac17eff Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2024-02-13 12:33:46 +00:00
if(CMAKE_GENERATOR MATCHES "^Ninja")
add_custom_command(
CMake: Fix framework headers not being copied after rm-ing build dir If a build dir is removed using rm -r *, this still leaves dot files around, specifically the .ninja_log file. Because of a possibly unspecified behavior of listing directories as OUTPUTs in a add_custom_command call for the ${target}_copy_fw_sync_headers custom target, we end up with a situation where the custom command is not rerun by ninja because the directory OUTPUT was encountered in the .ninja_log file. Make sure to specify an additional file as an OUTPUT, to ensure the command does rerun, and thus copies all headers from the syncqt staging directory. Amends 103eca1070a75bfa97d0b72b94e0c759ef0bcd1c Pick-to: 6.5 6.7 6.8 Fixes: QTBUG-126056 Change-Id: I5664cf074158199e0c7fd5e312ecf739133d7f2e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2024-06-04 13:06:37 +00:00
OUTPUT
"${output_dir}/${fw_versioned_header_dir}"
"${copy_fw_sync_headers_marker_file}"
Change the mechanism that copies framework header files Split the header copy custom commands into two blocks and add <module>_sync_headers_fw_copy target that is responsible for the copy of CaMeL-case header aliases. For the Ninja generator we leave the file-level dependencies between the <module>_sync_headers_fw_copy target and header copy commands. For the Unix Makefiles generator we put the command directly to the target to make sure it's executed by make. Also add the explicit commands for creating the output header directories. Fixes: QTBUG-122200 Pick-to: 6.5 6.6 6.7 Change-Id: I71ba716d17a879f20ae0869cf2257d246ac17eff Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2024-02-13 12:33:46 +00:00
DEPENDS ${target}_sync_headers
COMMAND ${copy_fw_sync_headers_command}
CMake: Fix framework headers not being copied after rm-ing build dir If a build dir is removed using rm -r *, this still leaves dot files around, specifically the .ninja_log file. Because of a possibly unspecified behavior of listing directories as OUTPUTs in a add_custom_command call for the ${target}_copy_fw_sync_headers custom target, we end up with a situation where the custom command is not rerun by ninja because the directory OUTPUT was encountered in the .ninja_log file. Make sure to specify an additional file as an OUTPUT, to ensure the command does rerun, and thus copies all headers from the syncqt staging directory. Amends 103eca1070a75bfa97d0b72b94e0c759ef0bcd1c Pick-to: 6.5 6.7 6.8 Fixes: QTBUG-126056 Change-Id: I5664cf074158199e0c7fd5e312ecf739133d7f2e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2024-06-04 13:06:37 +00:00
COMMAND ${copy_fw_sync_headers_marker_file_command}
macOS: Create framework headers symlink manually instead of via CMake As the latter requires us to awkwardly create a fake dummy header in the frameworks we ship. The symlink points to the `Current` version symlink, just like for the library itself and Resources -- both of which CMake generates still. Change-Id: I2db3f218a3c01cb1be73a0d7a514241b6c472ba3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2025-09-11 15:18:54 +00:00
COMMAND ${create_headers_symlink_command}
Change the mechanism that copies framework header files Split the header copy custom commands into two blocks and add <module>_sync_headers_fw_copy target that is responsible for the copy of CaMeL-case header aliases. For the Ninja generator we leave the file-level dependencies between the <module>_sync_headers_fw_copy target and header copy commands. For the Unix Makefiles generator we put the command directly to the target to make sure it's executed by make. Also add the explicit commands for creating the output header directories. Fixes: QTBUG-122200 Pick-to: 6.5 6.6 6.7 Change-Id: I71ba716d17a879f20ae0869cf2257d246ac17eff Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2024-02-13 12:33:46 +00:00
VERBATIM
)
add_custom_target(${target}_copy_fw_sync_headers
DEPENDS "${output_dir}/${fw_versioned_header_dir}")
else()
add_custom_target(${target}_copy_fw_sync_headers
CMake: Fix framework headers not being copied after rm-ing build dir If a build dir is removed using rm -r *, this still leaves dot files around, specifically the .ninja_log file. Because of a possibly unspecified behavior of listing directories as OUTPUTs in a add_custom_command call for the ${target}_copy_fw_sync_headers custom target, we end up with a situation where the custom command is not rerun by ninja because the directory OUTPUT was encountered in the .ninja_log file. Make sure to specify an additional file as an OUTPUT, to ensure the command does rerun, and thus copies all headers from the syncqt staging directory. Amends 103eca1070a75bfa97d0b72b94e0c759ef0bcd1c Pick-to: 6.5 6.7 6.8 Fixes: QTBUG-126056 Change-Id: I5664cf074158199e0c7fd5e312ecf739133d7f2e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2024-06-04 13:06:37 +00:00
COMMAND ${copy_fw_sync_headers_command}
COMMAND ${copy_fw_sync_headers_marker_file_command}
macOS: Create framework headers symlink manually instead of via CMake As the latter requires us to awkwardly create a fake dummy header in the frameworks we ship. The symlink points to the `Current` version symlink, just like for the library itself and Resources -- both of which CMake generates still. Change-Id: I2db3f218a3c01cb1be73a0d7a514241b6c472ba3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2025-09-11 15:18:54 +00:00
COMMAND ${create_headers_symlink_command}
Add the missing dependency between _copy_fw_sync_headers and _sync_headers The dependency is specified for the Ninja generator, but is missing for others, which leads to the invalid order when building with Unix Makefiles generator for MacOS platform. Amends 103eca1070a75bfa97d0b72b94e0c759ef0bcd1c Pick-to: 6.8 6.7 6.5 Fixes: QTBUG-127987 Change-Id: I78927ee3fa7b0926f03b0e5eab67983c4d0d3e67 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2024-08-28 16:36:05 +00:00
DEPENDS ${target}_sync_headers
CMake: Fix framework headers not being copied after rm-ing build dir If a build dir is removed using rm -r *, this still leaves dot files around, specifically the .ninja_log file. Because of a possibly unspecified behavior of listing directories as OUTPUTs in a add_custom_command call for the ${target}_copy_fw_sync_headers custom target, we end up with a situation where the custom command is not rerun by ninja because the directory OUTPUT was encountered in the .ninja_log file. Make sure to specify an additional file as an OUTPUT, to ensure the command does rerun, and thus copies all headers from the syncqt staging directory. Amends 103eca1070a75bfa97d0b72b94e0c759ef0bcd1c Pick-to: 6.5 6.7 6.8 Fixes: QTBUG-126056 Change-Id: I5664cf074158199e0c7fd5e312ecf739133d7f2e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2024-06-04 13:06:37 +00:00
)
Change the mechanism that copies framework header files Split the header copy custom commands into two blocks and add <module>_sync_headers_fw_copy target that is responsible for the copy of CaMeL-case header aliases. For the Ninja generator we leave the file-level dependencies between the <module>_sync_headers_fw_copy target and header copy commands. For the Unix Makefiles generator we put the command directly to the target to make sure it's executed by make. Also add the explicit commands for creating the output header directories. Fixes: QTBUG-122200 Pick-to: 6.5 6.6 6.7 Change-Id: I71ba716d17a879f20ae0869cf2257d246ac17eff Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2024-02-13 12:33:46 +00:00
endif()
Fix framework headers copying when module don't have header files Amends 103eca1070a75bfa97d0b72b94e0c759ef0bcd1c Change-Id: I3caae60c022cd46a6d33691760b619920d6e778e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2024-02-14 13:38:34 +00:00
if(out_files)
add_custom_command(
OUTPUT ${out_files}
DEPENDS ${target}_copy_fw_sync_headers ${in_files}
COMMAND
${CMAKE_COMMAND} -E make_directory ${out_dirs}
${copy_commands}
VERBATIM
COMMENT "Copy the ${target} header files to the framework directory"
)
set_property(TARGET ${target} APPEND PROPERTY
QT_COPIED_FRAMEWORK_HEADERS "${out_files}")
endif()
CMake: Split QtBuild.cmake into smaller files QtBuild.cmake is huge. Split it. Move module, plugin, tools, executables and test related functions out of QtBuild.cmake into separate files. Do the same for many other things too. An additional requirement is that all the new Helpers files only define functions and macros. No global variable definitions are allowed, nor execution of commands with side effects. Some notes: qt_install_qml_files is removed because it's dead code. Some functions still need to be figured out, because they are interspersed and depend on various global state assignments. Task-number: QTBUG-86035 Change-Id: I21d79ff02eef923c202eb1000422888727cb0e2c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-08-13 15:37:47 +00:00
endfunction()
function(qt_finalize_framework_headers_copy target)
get_target_property(target_type ${target} TYPE)
if(${target_type} STREQUAL "INTERFACE_LIBRARY")
return()
endif()
get_target_property(is_fw ${target} FRAMEWORK)
if(NOT "${is_fw}")
return()
endif()
get_target_property(headers ${target} QT_COPIED_FRAMEWORK_HEADERS)
if(headers)
# Add a target, e.g. Core_framework_headers, that triggers the header copy.
add_custom_target(${target}_framework_headers DEPENDS ${headers})
add_dependencies(${target} ${target}_framework_headers)
endif()
endfunction()
Move the framework related information to the common function Since the information about framework is performed in multiple places it's quite hard to control its consistency. This moves the obtaining of framework related information to the common function and adjusts the use of the information across the repo. Change-Id: I1f488d41dcea75a1e8c361926792a6b7c45e5a3f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-26 18:48:58 +00:00
# Collects the framework related information and paths from the target properties.
# Output variables:
# <out_var>_name framework base name, e.g. 'QtCore'.
# <out_var>_dir framework base directory, e.g. 'QtCore.framework'.
# <out_var>_version framework version, e.g. 'A', 'B' etc.
# <out_var>_bundle_version framework bundle version, same as the PROJECT_VERSION, e.g. '6.0.0'.
# <out_var>_header_dir top-level header directory, e.g. 'QtCore.framework/Headers'.
CMake: Set fw_versioned_binary_dir in the framework info function This will be used by the SBOM generation code to retrieve the directory where the framework file is installed. Change-Id: I882344f1fa3c5a77e3cce85d2044aa0e682bed40 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2024-05-21 15:19:55 +00:00
# <out_var>_versioned_binary_dir versioned directory that contains the framework binary,
# e.g. 'QtCore.framework/Versions/A'
Move the framework related information to the common function Since the information about framework is performed in multiple places it's quite hard to control its consistency. This moves the obtaining of framework related information to the common function and adjusts the use of the information across the repo. Change-Id: I1f488d41dcea75a1e8c361926792a6b7c45e5a3f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-26 18:48:58 +00:00
# <out_var>_versioned_header_dir header directory for specific framework version,
# e.g. 'QtCore.framework/Versions/A/Headers'
# <out_var>_private_header_dir header directory for the specific framework version and
# framework bundle version e.g. 'QtCore.framework/Versions/A/Headers/6.0.0'
Make framework names consistent with the module names For Apple's frameworks it's possible to include header files using the following assumption: If the framework name is "MyFramework" then '#include <MyFramework/frameworkheader.h>' will work without specifying the include path explicitly. This is broken for internal modules since they use the framework name with the 'Private' suffix. This uses the module name instead of the target name as a framework name. Amends edbe0eb335ca4c0fde23f57eae5acdf80937c9e3 Task-number: QTBUG-87775 Change-Id: I0592a28d0768724b6e10ca81aa7cefb0a3699a5e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-06-01 09:25:41 +00:00
# <out_var>_private_module_header_dir private header directory for the specific framework
# version, framework bundle version and tailing module name, e.g.
# 'QtCore.framework/Versions/A/Headers/6.0.0/Core'
Move the framework related information to the common function Since the information about framework is performed in multiple places it's quite hard to control its consistency. This moves the obtaining of framework related information to the common function and adjusts the use of the information across the repo. Change-Id: I1f488d41dcea75a1e8c361926792a6b7c45e5a3f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-26 18:48:58 +00:00
function(qt_internal_get_framework_info out_var target)
CMake: Fix calling some functions in CMake 3.16 Calling qt_internal_get_framework_info failed when the target was an INTERFACE_LIBRARY, because it tried to access properties that aren't allowed on such a target. Interface libraries can't be frameworks, so just add an early return guard. Do the same for qt_internal_apply_apple_privacy_manifest. Change-Id: I85b73449a0d56b92cd01b032d4ce5db905643c9f Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2024-03-07 17:02:56 +00:00
# Avoid "INTERFACE_LIBRARY targets may only have whitelisted properties" error on CMake < 3.17.
get_target_property(target_type ${target} TYPE)
if("${target_type}" STREQUAL "INTERFACE_LIBRARY")
return()
endif()
Move the framework related information to the common function Since the information about framework is performed in multiple places it's quite hard to control its consistency. This moves the obtaining of framework related information to the common function and adjusts the use of the information across the repo. Change-Id: I1f488d41dcea75a1e8c361926792a6b7c45e5a3f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-26 18:48:58 +00:00
get_target_property(${out_var}_version ${target} FRAMEWORK_VERSION)
get_target_property(${out_var}_bundle_version ${target} MACOSX_FRAMEWORK_BUNDLE_VERSION)
Make framework names consistent with the module names For Apple's frameworks it's possible to include header files using the following assumption: If the framework name is "MyFramework" then '#include <MyFramework/frameworkheader.h>' will work without specifying the include path explicitly. This is broken for internal modules since they use the framework name with the 'Private' suffix. This uses the module name instead of the target name as a framework name. Amends edbe0eb335ca4c0fde23f57eae5acdf80937c9e3 Task-number: QTBUG-87775 Change-Id: I0592a28d0768724b6e10ca81aa7cefb0a3699a5e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-06-01 09:25:41 +00:00
# The module name might be different of the actual target name
# and we want to use the Qt'fied module name as a framework identifier.
get_target_property(module_interface_name ${target} _qt_module_interface_name)
if(module_interface_name)
qt_internal_qtfy_target(module ${module_interface_name})
else()
qt_internal_qtfy_target(module ${target})
endif()
set(${out_var}_name "${module}")
Move the framework related information to the common function Since the information about framework is performed in multiple places it's quite hard to control its consistency. This moves the obtaining of framework related information to the common function and adjusts the use of the information across the repo. Change-Id: I1f488d41dcea75a1e8c361926792a6b7c45e5a3f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-26 18:48:58 +00:00
set(${out_var}_dir "${${out_var}_name}.framework")
set(${out_var}_header_dir "${${out_var}_dir}/Headers")
CMake: Set fw_versioned_binary_dir in the framework info function This will be used by the SBOM generation code to retrieve the directory where the framework file is installed. Change-Id: I882344f1fa3c5a77e3cce85d2044aa0e682bed40 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2024-05-21 15:19:55 +00:00
Enable shared library build of Qt for iOS As of f68e2c92cc0ed2c1929140402c061359bc2363a5, and its follow up changes, we can now link individual plugins statically, even if the Qt build is generally a shared build. This allows us to build Qt for iOS as shared libraries, while still keeping the platform plugin as a static library, since this is harder to port over to a shared library. This gives the benefit of faster turnaround during development, as well as binary compatibility promises for the main Qt libraries, without having to go fully shared for all of Qt. Static builds are still the default, due to the downsides of larger application bundles and slower load times for shared builds. For now the user has to manually tick the "Embed & Sign" check box in Xcode for each Qt library, which is only available with Xcode projects generated by the qmake Xcode generator. Task-number: QTBUG-85974 Change-Id: Id2b7bd2823c8e7c79068dda95295b574ada8d7f2 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-12-16 15:34:31 +00:00
if(UIKIT)
CMake: Set fw_versioned_binary_dir in the framework info function This will be used by the SBOM generation code to retrieve the directory where the framework file is installed. Change-Id: I882344f1fa3c5a77e3cce85d2044aa0e682bed40 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2024-05-21 15:19:55 +00:00
# iOS frameworks do not have a Versions sub-directory
CMake: Fix incorrect framework versioned_binary_dir output for iOS There was a stray '}' character in the value. Amends 8f03bb6bd8ad2d59e0043d26a0470faf42e98093 Change-Id: I06f9200b1449bc54ec07ace1336bb97a8f132158 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2024-05-23 10:08:40 +00:00
set(${out_var}_versioned_binary_dir "${${out_var}_dir}")
Enable shared library build of Qt for iOS As of f68e2c92cc0ed2c1929140402c061359bc2363a5, and its follow up changes, we can now link individual plugins statically, even if the Qt build is generally a shared build. This allows us to build Qt for iOS as shared libraries, while still keeping the platform plugin as a static library, since this is harder to port over to a shared library. This gives the benefit of faster turnaround during development, as well as binary compatibility promises for the main Qt libraries, without having to go fully shared for all of Qt. Static builds are still the default, due to the downsides of larger application bundles and slower load times for shared builds. For now the user has to manually tick the "Embed & Sign" check box in Xcode for each Qt library, which is only available with Xcode projects generated by the qmake Xcode generator. Task-number: QTBUG-85974 Change-Id: Id2b7bd2823c8e7c79068dda95295b574ada8d7f2 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-12-16 15:34:31 +00:00
set(${out_var}_versioned_header_dir "${${out_var}_header_dir}")
else()
CMake: Set fw_versioned_binary_dir in the framework info function This will be used by the SBOM generation code to retrieve the directory where the framework file is installed. Change-Id: I882344f1fa3c5a77e3cce85d2044aa0e682bed40 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2024-05-21 15:19:55 +00:00
set(${out_var}_versioned_binary_dir "${${out_var}_dir}/Versions/${${out_var}_version}")
set(${out_var}_versioned_header_dir "${${out_var}_versioned_binary_dir}/Headers")
Enable shared library build of Qt for iOS As of f68e2c92cc0ed2c1929140402c061359bc2363a5, and its follow up changes, we can now link individual plugins statically, even if the Qt build is generally a shared build. This allows us to build Qt for iOS as shared libraries, while still keeping the platform plugin as a static library, since this is harder to port over to a shared library. This gives the benefit of faster turnaround during development, as well as binary compatibility promises for the main Qt libraries, without having to go fully shared for all of Qt. Static builds are still the default, due to the downsides of larger application bundles and slower load times for shared builds. For now the user has to manually tick the "Embed & Sign" check box in Xcode for each Qt library, which is only available with Xcode projects generated by the qmake Xcode generator. Task-number: QTBUG-85974 Change-Id: Id2b7bd2823c8e7c79068dda95295b574ada8d7f2 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-12-16 15:34:31 +00:00
endif()
CMake: Tweak qt_internal_get_framework_info to match documentation <out_var>_private_header_dir and <out_var>_private_module_header_dir are documented to point to "the specific framework version and framework bundle version". Pick-to: 6.5 Change-Id: I00053f106ec9be88f7892c842ca75549cfc54124 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-12-16 15:11:05 +00:00
set(${out_var}_private_header_dir "${${out_var}_versioned_header_dir}/${${out_var}_bundle_version}")
Make framework names consistent with the module names For Apple's frameworks it's possible to include header files using the following assumption: If the framework name is "MyFramework" then '#include <MyFramework/frameworkheader.h>' will work without specifying the include path explicitly. This is broken for internal modules since they use the framework name with the 'Private' suffix. This uses the module name instead of the target name as a framework name. Amends edbe0eb335ca4c0fde23f57eae5acdf80937c9e3 Task-number: QTBUG-87775 Change-Id: I0592a28d0768724b6e10ca81aa7cefb0a3699a5e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-06-01 09:25:41 +00:00
set(${out_var}_private_module_header_dir "${${out_var}_private_header_dir}/${module}")
Move the framework related information to the common function Since the information about framework is performed in multiple places it's quite hard to control its consistency. This moves the obtaining of framework related information to the common function and adjusts the use of the information across the repo. Change-Id: I1f488d41dcea75a1e8c361926792a6b7c45e5a3f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-26 18:48:58 +00:00
set(${out_var}_name "${${out_var}_name}" PARENT_SCOPE)
set(${out_var}_dir "${${out_var}_dir}" PARENT_SCOPE)
set(${out_var}_header_dir "${${out_var}_header_dir}" PARENT_SCOPE)
set(${out_var}_version "${${out_var}_version}" PARENT_SCOPE)
set(${out_var}_bundle_version "${${out_var}_bundle_version}" PARENT_SCOPE)
CMake: Set fw_versioned_binary_dir in the framework info function This will be used by the SBOM generation code to retrieve the directory where the framework file is installed. Change-Id: I882344f1fa3c5a77e3cce85d2044aa0e682bed40 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2024-05-21 15:19:55 +00:00
set(${out_var}_versioned_binary_dir "${${out_var}_versioned_binary_dir}" PARENT_SCOPE)
Move the framework related information to the common function Since the information about framework is performed in multiple places it's quite hard to control its consistency. This moves the obtaining of framework related information to the common function and adjusts the use of the information across the repo. Change-Id: I1f488d41dcea75a1e8c361926792a6b7c45e5a3f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-26 18:48:58 +00:00
set(${out_var}_versioned_header_dir "${${out_var}_versioned_header_dir}" PARENT_SCOPE)
set(${out_var}_private_header_dir "${${out_var}_private_header_dir}" PARENT_SCOPE)
Make framework names consistent with the module names For Apple's frameworks it's possible to include header files using the following assumption: If the framework name is "MyFramework" then '#include <MyFramework/frameworkheader.h>' will work without specifying the include path explicitly. This is broken for internal modules since they use the framework name with the 'Private' suffix. This uses the module name instead of the target name as a framework name. Amends edbe0eb335ca4c0fde23f57eae5acdf80937c9e3 Task-number: QTBUG-87775 Change-Id: I0592a28d0768724b6e10ca81aa7cefb0a3699a5e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-06-01 09:25:41 +00:00
set(${out_var}_private_module_header_dir "${${out_var}_private_module_header_dir}" PARENT_SCOPE)
Move the framework related information to the common function Since the information about framework is performed in multiple places it's quite hard to control its consistency. This moves the obtaining of framework related information to the common function and adjusts the use of the information across the repo. Change-Id: I1f488d41dcea75a1e8c361926792a6b7c45e5a3f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-26 18:48:58 +00:00
endfunction()