From 103d1aa91083ed5ab6268996fcadc6a55e9cc465 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Mon, 26 Aug 2019 10:11:27 +0200 Subject: [PATCH] Use GLOB_RECURSE for testdata 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 --- util/cmake/pro2cmake.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 54521bab55b..c72e27b9cfd 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -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(