summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@qt.io>2019-10-03 13:24:51 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-10-04 06:27:19 +0000
commita98f64af91f8e96d2efe2b57d64f9fc41e2006b4 (patch)
treebd596327bdac61db23acd6e63ebf9143e56556dd /util
parente1beabc3b87ee202fa90af906be0cfeb2ffc2464 (diff)
cmake: add more tests in corelib/thread
This fixes the qatomicinteger magic by making $$basename work for one particular case. qthreadstorage still needs investigation. Task-number: QTBUG-78221 Change-Id: I7bb38f6ca24273bcf0443ab25685c8e815814c3c Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util')
-rwxr-xr-xutil/cmake/pro2cmake.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index b10df35ffb..5ef5d85f85 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -626,6 +626,14 @@ def handle_function_value(group: pp.ParseResults):
if function_name == "files":
return str(function_args[0])
+ if function_name == "basename":
+ if len(function_args) != 1:
+ print(f"XXXX basename with more than one argument")
+ if function_args[0] == '_PRO_FILE_PWD_':
+ return os.path.basename(os.getcwd())
+ print(f"XXXX basename with value other than _PRO_FILE_PWD_")
+ return os.path.basename(str(function_args[0]))
+
if isinstance(function_args, pp.ParseResults):
function_args = list(flatten_list(function_args.asList()))