summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-10-07 16:18:04 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-10-07 22:44:42 +0000
commitdca364ed1999ff1d4d9aa08154802963445f6508 (patch)
treeaf962466069c91221894bd273eed34c466318ffe /util
parent1569c6d85e72558c6fbc0a6f90eedfab14139dd2 (diff)
pro2cmake: Fix QT_BUILD_TREE variable mapping
CMake doesn't have a PROJECT_BUILD_DIR variable, but it does have a PROJECT_BINARY_DIR variable. Note that this might still be the wrong thing to do according to 35a30c7ebbd50e8b5b1fad7c00bd6c36b0dca8b9 , but it's still somwehat better. Change-Id: I493f82a791d933a16011d91774aaac4bcaffc5e5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'util')
-rwxr-xr-xutil/cmake/pro2cmake.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index 042d8022f1..e55f703930 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -797,7 +797,7 @@ class Scope(object):
if operations is None:
operations = {
"QT_SOURCE_TREE": [SetOperation(["${QT_SOURCE_TREE}"])],
- "QT_BUILD_TREE": [SetOperation(["${PROJECT_BUILD_DIR}"])],
+ "QT_BUILD_TREE": [SetOperation(["${PROJECT_BINARY_DIR}"])],
}
self._operations = copy.deepcopy(operations)