From d8a7c0f40fff382fb4dbe6088b6f86ca4f4d03f5 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Wed, 7 Aug 2019 14:45:17 +0200 Subject: [PATCH] Handle DESTDIR override Set OUTPUT_DIRECTORY on a target when DESTDIR is specified. Change-Id: I72061ae8156356fcb2aa9ba6cb87049fcef600c7 Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- util/cmake/pro2cmake.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index f700ef8dff7..c9fd604b2e4 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -1800,6 +1800,11 @@ def write_main_part(cm_fh: typing.IO[str], name: str, typename: str, cm_fh.write('{}list(APPEND test_data "{}")\n'.format(spaces(indent), data)) cm_fh.write('\n') + # Check for DESTDIR override + destdir = scope.get_string('DESTDIR') + if destdir: + extra_lines.append('OUTPUT_DIRECTORY "{}"'.format(destdir)) + cm_fh.write('{}{}({}\n'.format(spaces(indent), cmake_function, name)) for extra_line in extra_lines: cm_fh.write('{} {}\n'.format(spaces(indent), extra_line))