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

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>
This commit is contained in:
Tor Arne Vestbø 2025-09-11 17:18:54 +02:00
parent ed237ace67
commit a966d7be48
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmake/QtFrameworkHelpers.cmake
View File

@ -135,6 +135,14 @@ function(qt_copy_framework_headers target)
"${CMAKE_COMMAND}" -E touch "${copy_fw_sync_headers_marker_file}"
)
if(NOT UIKIT)
set(create_headers_symlink_command
"${CMAKE_COMMAND}" -E create_symlink
"Versions/Current/Headers"
"${output_dir}/${fw_header_dir}"
)
endif()
if(CMAKE_GENERATOR MATCHES "^Ninja")
add_custom_command(
OUTPUT
@ -143,6 +151,7 @@ function(qt_copy_framework_headers target)
DEPENDS ${target}_sync_headers
COMMAND ${copy_fw_sync_headers_command}
COMMAND ${copy_fw_sync_headers_marker_file_command}
COMMAND ${create_headers_symlink_command}
VERBATIM
)
add_custom_target(${target}_copy_fw_sync_headers
@ -151,6 +160,7 @@ function(qt_copy_framework_headers target)
add_custom_target(${target}_copy_fw_sync_headers
COMMAND ${copy_fw_sync_headers_command}
COMMAND ${copy_fw_sync_headers_marker_file_command}
COMMAND ${create_headers_symlink_command}
DEPENDS ${target}_sync_headers
)
endif()
@ -170,19 +180,6 @@ function(qt_copy_framework_headers target)
endif()
endfunction()
function(qt_internal_generate_fake_framework_header target)
# Hack to create the "Headers" symlink in the framework:
# Create a fake header file and copy it into the framework by marking it as PUBLIC_HEADER.
# CMake now takes care of creating the symlink.
set(fake_header "${CMAKE_CURRENT_BINARY_DIR}/${target}_fake_header.h")
qt_internal_get_main_cmake_configuration(main_config)
file(GENERATE OUTPUT "${fake_header}" CONTENT "// ignore this file\n"
CONDITION "$<CONFIG:${main_config}>")
target_sources(${target} PRIVATE "${fake_header}")
_qt_internal_set_source_file_generated(SOURCES "${fake_header}")
set_property(TARGET ${target} APPEND PROPERTY PUBLIC_HEADER "${fake_header}")
endfunction()
function(qt_finalize_framework_headers_copy target)
get_target_property(target_type ${target} TYPE)
if(${target_type} STREQUAL "INTERFACE_LIBRARY")
@ -194,8 +191,6 @@ function(qt_finalize_framework_headers_copy target)
endif()
get_target_property(headers ${target} QT_COPIED_FRAMEWORK_HEADERS)
if(headers)
qt_internal_generate_fake_framework_header(${target})
# 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)