diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-07 14:45:17 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-07 13:47:51 +0000 |
| commit | d8a7c0f40fff382fb4dbe6088b6f86ca4f4d03f5 (patch) | |
| tree | 182f8f72be5e1393d8c9b80d7487480e5f339cb8 | |
| parent | f9db9a22e9f0d35d8ecaf60b744e663efdd9ea3f (diff) | |
Handle DESTDIR override
Set OUTPUT_DIRECTORY on a target when DESTDIR is specified.
Change-Id: I72061ae8156356fcb2aa9ba6cb87049fcef600c7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
| -rwxr-xr-x | util/cmake/pro2cmake.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index f700ef8dff..c9fd604b2e 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)) |