1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not use REALPATH when collecting Qt header files

Browse Source 
CMake doesn't resolve REALPATH for the non-existing files.
This limitation blocks the use of REALPATH when collecting the
generated module header files. The real path should be resolved
by syncqt implicitly and CMake scripts should rely on ABSOLUTE paths
only, which should be consistent for any files including the generated
files.

Task-number: QTBUG-113295
Change-Id: I0219c7bf34ef6a6589c6d5fade4c2ed3f8036ef0
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
(cherry picked from commit b523a655c8b6fabb8b79bb274ef034dcd094e1f8)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Alexey Edelev 2023-05-02 16:39:31 +02:00
parent 2fdc4db757
commit cd7a9af7cb
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtModuleHelpers.cmake
View File

@ -1190,7 +1190,6 @@ function(qt_internal_collect_module_headers out_var target)
get_target_property(source_dir ${target} SOURCE_DIR)
endif()
get_filename_component(source_dir "${source_dir}" ABSOLUTE)
get_filename_component(source_dir "${source_dir}" REALPATH)
get_target_property(is_3rdparty_library ${target} _qt_module_is_3rdparty_header_library)
@ -1211,7 +1210,6 @@ function(qt_internal_collect_module_headers out_var target)
endif()
get_filename_component(file_path "${file_path}" ABSOLUTE)
get_filename_component(file_path "${file_path}" REALPATH)
string(FIND "${file_path}" "${source_dir}" source_dir_pos)
if(source_dir_pos EQUAL 0)