Skip to content

Commit

Permalink
CMake: Fix building examples targeting iOS simulator with qmake
Browse files Browse the repository at this point in the history
The makefile generated by qmake when building an iOS example tries to
execute the mkspecs/features/uikit/devices.py python script to find
a simulator ID.

When installing the mkspecs, we didn't preserve the source file
permissions which means that the executable bit was stripped.

This causes the makefile to call xcodebuild with an invalid simulator
id due to not being able to execute the python script.

Make sure to install the mkspecs directories preserving the source
file permissions.

Fixes: QTBUG-87639
Change-Id: Iaa33b740c93187155025891104e8a21c6e7c98c8
Reviewed-by: Cristian Adam <[email protected]>
  • Loading branch information
alcroito committed Oct 16, 2020
1 parent f772b8e commit ff33883
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ if(NOT QT_BUILD_STANDALONE_TESTS)
foreach(entry IN LISTS mkspecs_subdirs)
if (IS_DIRECTORY ${entry})
qt_copy_or_install(DIRECTORY "${entry}"
DESTINATION ${mkspecs_install_dir})
DESTINATION ${mkspecs_install_dir}
USE_SOURCE_PERMISSIONS)
else()
qt_copy_or_install(FILES "${entry}"
DESTINATION ${mkspecs_install_dir})
Expand Down

0 comments on commit ff33883

Please sign in to comment.