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

Use GLOB_RECURSE for testdata

Browse Source 
Use GLOB_RECURSE for testdata instead of globbing the top level folder.
Although RCC supports scanning directories, it will result in alias
collosions and test not being able to find the files on platforms
where test data is embedded into the binary.

Change-Id: I35d3d46a5d9fcafa5c8dc833eafdd0044ffe355f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2019-08-26 10:11:27 +02:00
parent 753e7c1061
commit 103d1aa910
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/cmake/pro2cmake.py
View File

@ -1883,8 +1883,7 @@ def write_main_part(cm_fh: typing.IO[str], name: str, typename: str,
for data in test_data:
if '*' in data:
cm_fh.write(dedent("""
{indent}file(GLOB test_data_glob
{indent1}LIST_DIRECTORIES true
{indent}file(GLOB_RECURSE test_data_glob
{indent1}RELATIVE ${{CMAKE_CURRENT_SOURCE_DIR}}
{indent1}"{}")
""").format(